diff --git a/kdegraphics.spec b/kdegraphics.spec index 5adbaef..d433721 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -3,11 +3,16 @@ %define final 1 %define make_cvs 0 +%if 0%{?fedora} > 7 +# make -libs subpkg +%define libs 1 +%endif + Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 Version: 3.5.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/Multimedia @@ -22,7 +27,13 @@ Patch3: kdegraphics-3.5.1-warning.patch Provides: kdegraphics3 = %{version}-%{release} Requires: ghostscript + +%if 0%{?libs} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +%else +Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +%endif BuildRequires: gettext BuildRequires: kdelibs3-devel >= %{version} @@ -102,6 +113,7 @@ Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} * kfaxview * kpovmodler +%if 0%{?libs} %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries @@ -110,7 +122,7 @@ Requires: kdelibs3 >= %{version} #Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. - +%endif %prep @@ -188,12 +200,17 @@ for dir in k* ; do done done +# unpackaged files +# omit kpovmodeler-devel files (for now) -- Rex +rm -f %{buildroot}/libkpovmodeler.so + %clean rm -rf %{buildroot} %post +%{!?libs:/sbin/ldconfig} for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: @@ -201,15 +218,19 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +%{!?libs:/sbin/ldconfig} for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%if 0%{?libs} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%endif + %if 0%{!?rhel:1} %post extras @@ -256,7 +277,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %doc rpmdocs/kpovmodeler/ %doc %{_docdir}/HTML/en/kpovmodeler/ %{_bindir}/kpovmodeler -%{_libdir}/libkpovmodeler.* +%{_libdir}/libkpovmodeler.so.* +%{_libdir}/libkpovmodeler.la %{_libdir}/kde3/libkpovmodelerpart.* %{_datadir}/applications/kde/kpovmodeler.desktop %{_datadir}/apps/kpovmodeler/ @@ -310,21 +332,30 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_libdir}/libkdeinit_*.so %{_libdir}/kde3/* -%files devel -%defattr(-,root,root,-) -%{_includedir}/kde/* -%{_libdir}/lib*.so -%exclude %{_libdir}/libkdeinit_*.so - +%if 0%{?libs} %files libs %defattr(-,root,root,-) %exclude %{_libdir}/libkfaximage.la %exclude %{_libdir}/libkpovmodeler.la +%exclude %{_libdir}/libkpovmodeler.so.* +%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la +%files devel +%defattr(-,root,root,-) +%{_includedir}/kde/* +%{_libdir}/lib*.so +#exclude %{_libdir}/libkpovmodeler.so +%exclude %{_libdir}/libkfaximage.so +%exclude %{_libdir}/libkdeinit_*.so + %changelog +* Tue Oct 16 2007 Rex Dieter - 7:3.5.8-3 +- -libs: exclude libkpovmodeler +- -libs conditional (f8+) + * Mon Oct 15 2007 Rex Dieter - 7:3.5.8-2 - respin (for openexr-1.6.0) - -libs: %%post/%%postun -p /sbin/ldconfig