From 42c9a323e264d00b7a77c1421c3aff1a42560646 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Tue, 10 Apr 2012 23:42:12 +0200 Subject: [PATCH] templates: several minor fixes and improvements Signed-off-by: Davide Madrisan --- ChangeLog | 9 +++++++++ autospec.conf.in | 3 +++ templates/kde4 | 16 ++++++++++++++++ templates/library | 2 +- templates/python | 3 +++ 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a4889a9..5d51448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Changes in version 1.9.4 - + 2012 Davide Madrisan + ++ improvement + * templates/{library,kde4,python} - Davide Madrisan: + Several minor fixes and improvements. + +-------------------------------------------------------------------------------- + Changes in version 1.9.3 - April Fools' Day Release Sun Apr 01 2012 Davide Madrisan diff --git a/autospec.conf.in b/autospec.conf.in index 2b82fa1..1a80dbe 100644 --- a/autospec.conf.in +++ b/autospec.conf.in @@ -504,6 +504,9 @@ format_autoformat=0 # Set this variable to modify the rpm unpackaged file list conversion format_unpackaged_file_list="\ +# translations for python packages +s,^/usr/lib/python2.6/site-packages,%{python_sitearch}, +# generic translations s,^/usr/bin,%{_bindir}, s,^/usr/sbin,%{_sbindir}, s,^/usr/libexec,%{_libexecdir}, diff --git a/templates/kde4 b/templates/kde4 index a0be78e..72833c4 100644 --- a/templates/kde4 +++ b/templates/kde4 @@ -26,6 +26,15 @@ BuildRoot: @rpm_default_buildroot@ %description ... +## remove the devel blocks if this package does not provide development stuff +%package devel +Group: Development/Libraries +Summary: Development files for %{name} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} + +%description devel +This package contains libraries and header files for developing applications that use %{name}. + %prep %setup -q #%patch0 -p1 @@ -120,6 +129,13 @@ exit 0 ## note: eventually add the remaining documents (if any) # @standard_docs_devel@ +## remove this block if the package does not provide development stuff +%files devel +%defattr(-,root,root) +## note: this list is just an example; modify as required +# %{_kde4_includedir}/%{name} +# %{_kde4_libdir}/*.so + %changelog * @spec_changelog_date@ @packager_fullname@ <@packager_email@> @pck_version@-@spec_first_release@@DISTRO_rpm@ - @spec_changelog_comment@ diff --git a/templates/library b/templates/library index d1e7ce1..2cdd088 100644 --- a/templates/library +++ b/templates/library @@ -106,7 +106,7 @@ This package includes the %{name} API documentation. @makeinstall@ @if:i18n -%find_lang %{name} +%find_lang %{name} || touch %{name}.lang @fi:i18n %clean diff --git a/templates/python b/templates/python index 808bc74..bbda03a 100644 --- a/templates/python +++ b/templates/python @@ -41,6 +41,9 @@ sed -i "\\,\\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist %files -f %{name}.filelist %defattr(-,root,root) +## note: this list is just an example; modify as required +# %{python_sitearch}/%{name}.py* +# %{python_sitearch}/%{name}.so @standard_docs@ ## note: eventually add the remaining documents (if any) # @standard_docs_devel@