rpms/kdeutils/devel kdeutils.spec,1.162,1.163
Rex Dieter
rdieter at fedoraproject.org
Fri Mar 6 14:42:38 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17669
Modified Files:
kdeutils.spec
Log Message:
* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
- -printer-applet subpkg
- cleanup unused -libs/-devel crud
Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kdeutils.spec 27 Feb 2009 13:04:49 -0000 1.162
+++ kdeutils.spec 6 Mar 2009 14:42:08 -0000 1.163
@@ -39,17 +39,16 @@
%if 0%{?printer_applet}
BuildRequires: PyKDE4-devel >= %{version}
BuildRequires: system-config-printer-libs
-Requires: PyKDE4 >= %{version}
-Requires: hal-cups-utils
-Requires: system-config-printer-libs
+# upgrade path so it doesn't get lost
+Requires: %{name}-printer-applet = %{epoch}:%{version}-%{release}
%endif
Provides: okteta = 0.1.0-1
Obsoletes: okteta < 0.1.0-1
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: %{name}-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kdeutils-extras < 6:4.0.0
+Obsoletes: kdeutils-libs < 6:4.0.0
+Obsoletes: kdeutils-devel < 6:4.0.0
%description
Utilities for the K Desktop Environment.
@@ -72,18 +71,13 @@
* superkaramba
* sweeper (clean unwanted traces the user leaves on the system)
-%package libs
-Summary: Runtime libraries for %{name}
-Group: System Environment/Libraries
-%description libs
-%{summary}.
-
-%package devel
-Group: Development/Libraries
-Summary: Development files for %{name}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: kdepimlibs4-devel kdebase-workspace-devel
-%description devel
+%package printer-applet
+Summary: KDE printer applet
+Group: Applications/System
+Requires: PyKDE4 >= %{version}
+Requires: hal-cups-utils
+Requires: system-config-printer-libs
+%description printer-applet
%{summary}.
@@ -102,6 +96,7 @@
%patch0 -p1 -b .kjots
%endif
+
%build
mkdir -p %{_target_platform}
@@ -109,7 +104,7 @@
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
%install
@@ -131,21 +126,33 @@
%post
/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
-%{_kde4_bindir}/*
+%{_kde4_bindir}/ark
+%{_kde4_bindir}/kcalc
+%{_kde4_bindir}/kcharselect
+%{_kde4_bindir}/kdessh
+%{_kde4_bindir}/kdf
+%{_kde4_bindir}/kfloppy
+%{_kde4_bindir}/kgpg
+%{_kde4_bindir}/ktimer
+%{_kde4_bindir}/kwalletmanager
+%{_kde4_bindir}/kwikdisk
+%{_kde4_bindir}/okteta
+%{_kde4_bindir}/superkaramba
+%{_kde4_bindir}/sweeper
%{_kde4_appsdir}/ark/
%{_kde4_appsdir}/kcalc/
%{_kde4_appsdir}/kcharselect/
@@ -155,9 +162,6 @@
%{_kde4_appsdir}/kwalletmanager/
%{_kde4_appsdir}/okteta/
%{_kde4_appsdir}/oktetapart/
-%if 0%{?printer_applet}
-%{_kde4_appsdir}/printer-applet/
-%endif
%{_kde4_appsdir}/superkaramba/
%{_kde4_appsdir}/sweeper/
%{_kde4_datadir}/kde4/services/*
@@ -173,27 +177,25 @@
%{_kde4_libdir}/libkdeinit*.so
%{_kde4_libdir}/kde4/*
%if 0%{?include_kjots}
+%{_kde4_bindir}/kjots
%{_kde4_appsdir}/kjots/
%{_kde4_docdir}/HTML/en/kjots/
%endif
%{_mandir}/man1/*
-%if 0
-%files libs
-%defattr(-,root,root,-)
-%endif
-%{_kde4_libdir}/lib*.so.*
-
-%if 0
-%files devel
+%if 0%{?printer_applet}
%defattr(-,root,root,-)
-%{_kde4_includedir}/*
-%exclude %{_kde4_libdir}/libkdeinit*.so
-%{_kde4_libdir}/lib*.so
+%{_kde4_bindir}/printer-applet
+%{_kde4_datadir}/autostart/printer-applet.desktop
+%{_kde4_appsdir}/printer-applet/
%endif
%changelog
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.1-2
+- -printer-applet subpkg
+- cleanup unused -libs/-devel crud
+
* Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
- 4.2.1
More information about the fedora-extras-commits
mailing list