[kdepim-runtime] drop useless -devel pkg
Rex Dieter
rdieter at fedoraproject.org
Wed Dec 7 16:50:38 UTC 2011
commit a600221dca403a6e9eed8bccbcc08a4f8da8b346
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Dec 7 10:50:27 2011 -0600
drop useless -devel pkg
kdepim-runtime.spec | 64 ++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 38 deletions(-)
---
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index ecaf046..85cc337 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -5,7 +5,7 @@ Name: kdepim-runtime
Summary: KDE PIM Runtime Environment
Epoch: 1
Version: 4.7.90
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Group: Applications/Productivity
@@ -16,16 +16,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# show the Akonadi KCM in System Settings (#565420)
Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
-# disable nepomuk/strigi notification spam
-Patch1: kdepim-runtime-4.7.2-nepomuk_notification.patch
-
## upstreamable patches
# Enable SQLite support in akonadi
Patch50: kdepim-runtime-4.7.1-sqlite-support.patch
-# fix linking wrt convenience lib nepomukfeederpluginlib
-Patch51: kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch
## upstream patches
+# fix linking wrt convenience lib nepomukfeederpluginlib
+Patch100: kdepim-runtime-4.7.90-nepomukfeederpluginlib_static.patch
+
+# nuke ill-advised -devel pkg
+Obsoletes: kdepim-runtime-devel < 4.7.90-3
Provides: kdepim4-runtime = %{version}-%{release}
@@ -56,26 +56,13 @@ Requires: akonadi%{?_isa} >= %{akonadi_version}
%description libs
%{summary}.
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Provides: kdepim4-runtime-devel = %{version}-%{release}
-Provides: kdepim4-runtime-devel%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: kdepimlibs-devel
-%description devel
-%{summary}.
-Install %{name}-devel if you want to write or compile %{name} plugins.
-
%prep
%setup -q -n kdepim-runtime-%{version}%{?pre}
%patch0 -p1 -b .show_akonadi_kcm
-## FIXME, rebase? -- rex
-#patch1 -p1 -b .nepomuk_notification
%patch50 -p1 -b .sqlite-support
-%patch51 -p1 -b .nepomukfeederpluginlib_static
+%patch100 -p1 -b .nepomukfeederpluginlib_static
%build
@@ -92,6 +79,10 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+# unpackaged files
+rm -fv %{buildroot}%{_kde4_libdir}/lib{akonadi-filestore,akonadi-xml,kdepim-copy,kmindexreader,maildir}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libnepomukfeederpluginlib.a
+
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -99,6 +90,10 @@ for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
done
+%clean
+rm -rf %{buildroot}
+
+
%post
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -115,15 +110,6 @@ if [ $1 -eq 0 ] ; then
update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
fi
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%clean
-rm -rf %{buildroot}
-
-
%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
@@ -148,22 +134,24 @@ rm -rf %{buildroot}
%dir %{_datadir}/ontology/kde/
%{_datadir}/ontology/kde/aneo.*
-# no headers = no api? why keep -devel around? --rex
-%files devel
-%defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so
-# This one is unversioned.
-%exclude %{_kde4_libdir}/libnepomukdatamanagement-copy.so
-%{_kde4_libdir}/libnepomukfeederpluginlib.a
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files libs
%defattr(-,root,root,-)
-%{_kde4_libdir}/lib*.so.*
-# This one is unversioned.
+%{_kde4_libdir}/libakonadi-filestore.so.4*
+%{_kde4_libdir}/libakonadi-xml.so.4*
+%{_kde4_libdir}/libkdepim-copy.so.4*
+%{_kde4_libdir}/libkmindexreader.so.4*
+%{_kde4_libdir}/libmaildir.so.4*
+# unversioned
%{_kde4_libdir}/libnepomukdatamanagement-copy.so
%changelog
+* Wed Dec 07 2011 Rex Dieter <rdieter at fedoraproject.org> 1:4.7.90-3
+- drop useless -devel pkg
+
* Mon Dec 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.7.90-2
- move unversioned libnepomukdatamanagement-copy.so from -devel to -libs
More information about the scm-commits
mailing list