rpms/kdeutils/devel kdeutils.spec,1.85,1.86

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 18 12:39:44 UTC 2007


Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31675

Modified Files:
	kdeutils.spec 
Log Message:
cleanup



Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- kdeutils.spec	7 Feb 2007 23:16:14 -0000	1.85
+++ kdeutils.spec	18 Apr 2007 12:39:37 -0000	1.86
@@ -4,22 +4,24 @@
 %define arts 1
 %define redhatify 1
 
-%define qt_version 3.3.7
+%define qt_version 3.3.8
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
 %define appdir %{_datadir}/applications/kde
 
 Version: 3.5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Name: kdeutils
 Summary: K Desktop Environment - Utilities
 Epoch: 6
+
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.kde.org
-Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: klaptop_acpi_helper.pam
 Source2: klaptop_acpi_helper.console
 Source3: kcmlaptoprc
@@ -28,16 +30,15 @@
 Patch2: kdeutils-3.5.4-bz#205553.patch
 Patch3: kdeutils-3.5.4-suspend.patch
 
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
+Requires: usermode
 
 BuildRequires: kdebase-devel
 BuildRequires: automake
-BuildRequires: autoconf
 BuildRequires: libtool
 BuildRequires: gettext
 BuildRequires: net-snmp-devel
@@ -46,7 +47,6 @@
 BuildRequires: gmp-devel
 
 Obsoletes: ark
-Obsoletes: kcalc
 Obsoletes: kcharselect
 Obsoletes: kdepasswd
 Obsoletes: kdessh
@@ -63,34 +63,56 @@
 Obsoletes: kregexpeditor-devel
 Obsoletes: ktimer
 Obsoletes: superkaramba
-Provides: superkaramba
+Provides:  superkaramba
 
 %description
 Utilities for the K Desktop Environment.
-Includes: ark (tar/gzip archive manager); kcalc (scientific calculator);
-kcharselect (character selector); kdepasswd (change password);
-kdessh (ssh front end); kdf (view disk usage); kedit (simple text editor);
-kfloppy (floppy formatting tool); khexedit (hex editor); kjots (note taker);
-klaptopdaemon (battery monitoring and management for laptops);
-ksim (system information monitor); ktimer (task scheduler);
-kwikdisk (removable media utility)
+Includes:
+  * ark (tar/gzip archive manager);
+  * kcharselect (character selector);
+  * kdepasswd (change password);
+  * kdessh (ssh front end);
+  * kdf (view disk usage);
+  * kedit (simple text editor);
+  * kfloppy (floppy formatting tool);
+  * khexedit (hex editor);
+  * kjots (note taker);
+  * ktimer (task scheduler);
+  * kwikdisk (removable media utility)
 
 %package devel
 Summary: Development files for kdeutils
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-extras = %{epoch}:%{version}-%{release}
 Requires: kdebase-devel
 
 %description devel
 Development files for kdeutils. Install kdeutils-devel if you wish
 to develop or compile KDE utils applications.
 
+%package extras
+Summary: Extras packages from KDEnetwork
+Group: Applications/Internet
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+Obsoletes: kcalc
+
+%description extras
+More Utilities for the K Desktop Environment:
+ * kcalc (scientific calculator);
+ * kmilo
+ * ksim (system information monitor);
+ * klaptopdaemon (battery monitoring and management for laptops);
+
 %prep
 %setup -q
+
 %patch1 -p1 -b .label
 %patch2 -p1 -b .bz#205553
 %patch3 -p1 -b .suspend
 
+
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -119,6 +141,7 @@
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -128,34 +151,52 @@
 for i in kcalc kregexpeditor Kjots ktimer kdf kcmdf ksim KFloppy KEdit \
          KCharSelect ark kwalletmanager kwalletconfig \
          irkick kcmlirc laptop pcmcia kvaio thinkpad kwikdisk; do
-   if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
-     echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
-   fi
+    if [ -f %{buildroot}%{appdir}/$i.desktop ] ; then
+        echo "OnlyShowIn=KDE;" >> %{buildroot}%{appdir}/$i.desktop
+    fi
 done
 
-# Make symlinks relative
-pushd %{buildroot}%{_docdir}/HTML/en
-for i in *; do
-   [ -d $i -a -L $i/common ] && ln -sf ../common $i
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+    pushd $lang_dir/kcontrol
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
+      done
+    popd
+  fi
 done
-popd
+fi
 
 # using pam
-install -m 755 -d %{buildroot}/%{_sysconfdir}/pam.d
+install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/pam.d/klaptop_acpi_helper
 
-install -m 755 -d %{buildroot}/%{_sysconfdir}/security/console.apps/
-install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+install -m 755 -d %{buildroot}%{_sysconfdir}/security/console.apps/
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper
 
-pushd %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_sbindir}
-mv klaptop_acpi_helper ../sbin
-ln -s consolehelper klaptop_acpi_helper
+pushd %{buildroot}%{_bindir}
+  mkdir -p %{buildroot}%{_sbindir}
+  mv klaptop_acpi_helper ../sbin
+  ln -s consolehelper klaptop_acpi_helper
 popd
 
 # klaptop setting
-mkdir -p %{buildroot}/%{_datadir}/config
-install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/config/
+mkdir -p %{buildroot}%{_datadir}/config
+install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/
 
 %clean
 rm -rf %{buildroot}
@@ -176,7 +217,125 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
-%files
+%post extras
+/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
+
+%postun extras
+/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
+
+%files extras
+%defattr(-,root,root,-)
+
+# kcalc
+%doc %{_docdir}/HTML/??/kcalc/
+%{_bindir}/kcalc
+%{_libdir}/kde3/kcalc.*
+%{_libdir}/libkdeinit_kcalc.la
+%{_libdir}/libkdeinit_kcalc.so
+%{_datadir}/applications/kde/kcalc.desktop
+%{_datadir}/apps/kcalc
+%config %{_datadir}/config.kcfg/kcalc.kcfg
+%{_datadir}/icons/hicolor/??x??/apps/kcalc.png
+%{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+
+# kmilo
+%{_libdir}/kde3/kded_kmilod.*
+%{_libdir}/kde3/kmilo*
+%{_libdir}/libkmilo.la
+%{_libdir}/libkmilo.so.*
+%{_datadir}/services/kded/kmilod.desktop
+%{_datadir}/services/kmilo
+%{_datadir}/servicetypes/kmilo
+
+# ksim
+%doc %{_docdir}/HTML/??/ksim/
+%{_libdir}/kde3/ksim*
+%{_libdir}/libksimcore.la
+%{_libdir}/libksimcore.so.*
+%{_datadir}/apps/kicker/extensions/ksim.desktop
+%{_datadir}/apps/ksim/
+%config %{_datadir}/config/ksim_panelextensionrc
+%{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%doc %{_docdir}/HTML/en/kcontrol
+%{_sysconfdir}/pam.d/klaptop_acpi_helper
+%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%{_bindir}/klaptop*
+%{_libdir}/kde3/kded_klaptopdaemon.*
+%{_sbindir}/klaptop_acpi_helper
+%{_datadir}/apps/klaptopdaemon
+%{_datadir}/services/kded/klaptopdaemon.desktop
+%{_libdir}/kde3/kcm_laptop.*
+%{_libdir}/libkcmlaptop.*
+%{_datadir}/applications/kde/laptop.desktop
+%config %{_datadir}/config/kcmlaptoprc
+%{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
+
+%files -f %{name}.lang
+
+# kcalc
+%exclude %{_docdir}/HTML/??/kcalc/
+%exclude %{_bindir}/kcalc
+%exclude %{_libdir}/kde3/kcalc.*
+%exclude %{_libdir}/libkdeinit_kcalc.la
+%exclude %{_libdir}/libkdeinit_kcalc.so
+%exclude %{_datadir}/applications/kde/kcalc.desktop
+%exclude %{_datadir}/apps/kcalc
+%exclude %{_datadir}/config.kcfg/kcalc.kcfg
+%exclude %{_datadir}/icons/hicolor/??x??/apps/kcalc.png
+%exclude %{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+
+# kmilo
+%exclude %{_libdir}/kde3/kded_kmilod.*
+%exclude %{_libdir}/kde3/kmilo*
+%exclude %{_libdir}/libkmilo.la
+%exclude %{_libdir}/libkmilo.so.*
+%exclude %{_datadir}/services/kded/kmilod.desktop
+%exclude %{_datadir}/services/kmilo
+%exclude %{_datadir}/servicetypes/kmilo
+
+
+# ksim
+%exclude %{_docdir}/HTML/??/ksim/
+%exclude %{_libdir}/kde3/ksim*
+%exclude %{_libdir}/libksimcore.la
+%exclude %{_libdir}/libksimcore.so.*
+%exclude %{_datadir}/apps/kicker/extensions/ksim.desktop
+%exclude %{_datadir}/apps/ksim/
+%exclude %{_datadir}/config/ksim_panelextensionrc
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ksim.png
+%exclude %{_datadir}/icons/crystalsvg/16x16/devices/ksim_cpu.png
+
+# klaptop
+%exclude %{_sysconfdir}/pam.d/klaptop_acpi_helper
+%exclude %{_sysconfdir}/security/console.apps/klaptop_acpi_helper
+%exclude %{_bindir}/klaptop*
+%exclude %{_libdir}/kde3/kded_klaptopdaemon.*
+%exclude %{_sbindir}/klaptop_acpi_helper
+%exclude %{_datadir}/apps/klaptopdaemon
+%exclude %{_datadir}/services/kded/klaptopdaemon.desktop
+%exclude %{_libdir}/kde3/kcm_laptop.*
+%exclude %{_libdir}/libkcmlaptop.*
+%exclude %{_datadir}/applications/kde/laptop.desktop
+%exclude %{_datadir}/config/kcmlaptoprc
+%exclude %{_docdir}/HTML/en/kcontrol/
+%exclude %{_datadir}/icons/crystalsvg/128x128/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/??x??/apps/laptop_battery.png
+%exclude %{_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz
+
 %defattr(-,root,root)
 %doc %{_docdir}/HTML/en/*
 %attr(644,root,root) %{_sysconfdir}/security/console.apps/*
@@ -205,6 +364,15 @@
 %exclude %{_libdir}/libkdeinit*.so
 
 %changelog
+* Wed Apr 18 2007 Than Ngo <than at redhat.com> - 6:3.5.6-2
+- cleanup
+
+* Sun Feb 18 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 6:3.5.6-0.2
+- kcalc, kmilo, klaptop and ksim Split into an extra package - kde-utils
+- Dropped explicit BR - autoconf
+- Minor clean ups
+- since the package uses consolehelper, it requires: usermode
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
 
@@ -218,6 +386,9 @@
 - rebuild with new net-snmp-libs
 - fix automake version check
 
+* Wed Jan 31 2007 Than Ngo <than at redhat.com> 6:3.5.6-0.1.fc6
+- 3.5.6
+
 * Thu Oct 26 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.1
 - 3.5.5
 
@@ -269,7 +440,7 @@
 * Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 6:3.5.1-1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1 
+* Sun Feb 05 2006 Than Ngo <than at redhat.com> 6:3.5.1-1
 - 3.5.1
 
 * Mon Jan 16 2006 Than Ngo <than at redhat.com> 6:3.5.0-4
@@ -279,7 +450,7 @@
 - rebuilt against new libnetsnmp
 
 * Tue Dec 20 2005 Than Ngo <than at redhat.com> 6:3.5.0-2
-- fix file conflict with superkaramba #176044 
+- fix file conflict with superkaramba #176044
 
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt
@@ -287,10 +458,10 @@
 * Wed Nov 30 2005 Than Ngo <than at redhat.com> 6:3.5.0-1
 - 3.5
 
-* Wed Nov 09 2005 Than Ngo <than at redhat.com> 6:3.4.92-4 
+* Wed Nov 09 2005 Than Ngo <than at redhat.com> 6:3.4.92-4
 - rebuilt against new openssl
-  
-* Thu Nov 03 2005 Than Ngo <than at redhat.com> 6:3.4.92-3 
+
+* Thu Nov 03 2005 Than Ngo <than at redhat.com> 6:3.4.92-3
 - rebuilt against new net-snmp
 
 * Fri Oct 28 2005 Than Ngo <than at redhat.com> 6:3.4.92-2
@@ -326,7 +497,7 @@
 * Tue Mar 01 2005 Than Ngo <than at redhat.com> 6:3.4.0-0.rc1.1
 - KDE 3.4.0 rc1
 
-* Mon Feb 21 2005 Than Ngo <than at redhat.com> 6:3.3.92-0.1 
+* Mon Feb 21 2005 Than Ngo <than at redhat.com> 6:3.3.92-0.1
 - KDE-3.4 beta2
 
 * Tue Feb 08 2005 Than Ngo <than at redhat.com> 6:3.3.2-0.2




More information about the fedora-cvs-commits mailing list