rpms/kdeutils/devel kdeutils.spec,1.93,1.94

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22129

Modified Files:
	kdeutils.spec 
Log Message:
* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
- move kcalc back to main pkg



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- kdeutils.spec	20 Aug 2007 18:27:19 -0000	1.93
+++ kdeutils.spec	29 Aug 2007 19:33:59 -0000	1.94
@@ -5,9 +5,11 @@
 %define final 0
 %define make_cvs 1
 %define arts 1
-
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
+# include -devel subpkg or not? 0=no,1=yes
+#   consider dropping -devel subpkg -- Rex
+%define devel 1
+# include kalc in main pkg?
+%define kcalc_in_main 1
 
 %define appdir %{_datadir}/applications/kde
 
@@ -15,7 +17,7 @@
 Summary: K Desktop Environment - Utilities
 Epoch:   6
 Version: 3.5.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/System
@@ -35,7 +37,7 @@
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 %if %{make_cvs}
 BuildRequires: automake libtool
 %endif
@@ -52,10 +54,15 @@
 Obsoletes: superkaramba < 0:%{superkaramba_ver}
 Provides:  superkaramba = 0:%{superkaramba_ver}
 
+%if ! %{devel}
+Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
+%endif
+
 %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);
@@ -68,16 +75,17 @@
   * ktimer (task scheduler);
   * kwikdisk (removable media utility)
 
-# consider nuking -devel subpkg 
-# afaik,nobody BR's it, and it pulls kdeutils into multilib -- Rex
+%if %{devel} 
+# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
 %package devel
 Summary: Development files for %{name} 
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: %{name}-extras = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel
+Requires: kdelibs3-devel
 %description devel
 Development files for %{name}.
+%endif
 
 %package extras
 Summary: Extras packages from %{name} 
@@ -86,7 +94,6 @@
 Requires: usermode
 %description extras
 More Utilities for the K Desktop Environment:
- * kcalc (scientific calculator);
  * kmilo
  * ksim (system information monitor);
  * klaptopdaemon (battery monitoring and management for laptops);
@@ -181,6 +188,12 @@
 # klaptop setting
 install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/config/kcmlaptoprc
 
+# unpackaged files
+%if ! %{devel}
+rm -rf %{buildroot}%{_includedir}/kde/
+rm -f %{buildroot}%{_libdir}/lib{kcmlaptop,khexeditcommon,kmilo,kregexpeditorcommon,ksimcore}.so
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -220,6 +233,7 @@
 %files extras
 %defattr(-,root,root,-)
 
+%if ! %{kcalc_in_main}
 # kcalc
 %{_docdir}/HTML/*/kcalc/
 %{_bindir}/kcalc
@@ -228,9 +242,10 @@
 %{_libdir}/libkdeinit_kcalc.so
 %{_datadir}/applications/kde/kcalc.desktop
 %{_datadir}/apps/kcalc
-%config %{_datadir}/config.kcfg/kcalc.kcfg
+%{_datadir}/config.kcfg/kcalc.kcfg
 %{_datadir}/icons/hicolor/??x??/apps/kcalc.png
 %{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+%endif
 
 # kmilo
 %{_libdir}/kde3/kded_kmilod.*
@@ -273,6 +288,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 
+%if ! %{kcalc_in_main}
 # kcalc
 %exclude %{_docdir}/HTML/*/kcalc/
 %exclude %{_bindir}/kcalc
@@ -284,6 +300,7 @@
 %exclude %{_datadir}/config.kcfg/kcalc.kcfg
 %exclude %{_datadir}/icons/hicolor/??x??/apps/kcalc.png
 %exclude %{_datadir}/icons/hicolor/scalable/apps/kcalc.svgz
+%endif
 
 # kmilo
 %exclude %{_libdir}/kde3/kded_kmilod.*
@@ -342,14 +359,22 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/autostart/*
 
+%if %{devel}
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
-%{_libdir}/*.so
-%exclude %{_libdir}/libkdeinit*.so
+%{_libdir}/libkcmlaptop.so
+%{_libdir}/libkhexeditcommon.so
+%{_libdir}/libkmilo.so
+%{_libdir}/libkregexpeditorcommon.so
+%{_libdir}/libksimcore.so
+%endif
 
 
 %changelog
+* Wed Aug 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-5
+- move kcalc back to main pkg
+
 * Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
 - License: GPLv2
 - cleanups