rpms/kdeutils/F-8 kdeutils.spec,1.98,1.99

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Oct 25 20:18:05 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26003

Modified Files:
	kdeutils.spec 
Log Message:
* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3
- Obsoletes: %name ... to help out multilib upgrades



Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-8/kdeutils.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- kdeutils.spec	13 Oct 2007 23:37:39 -0000	1.98
+++ kdeutils.spec	25 Oct 2007 20:17:30 -0000	1.99
@@ -5,9 +5,13 @@
 %define final 1 
 %define make_cvs 1
 %define arts 1
-# include -devel subpkg or not? 0=no,1=yes
-#   consider dropping -devel subpkg -- Rex
-#define devel 1
+
+%if 0%{?fedora} > 7
+# include -devel subpkg or not? 1=yes
+%else
+%define devel 1
+%endif
+
 # include kalc in main pkg?
 %define kcalc_in_main 1
 
@@ -17,7 +21,7 @@
 Summary: K Desktop Environment - Utilities
 Epoch:   6
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/System
@@ -55,6 +59,8 @@
 Provides:  superkaramba = 0:%{superkaramba_ver}
 
 %if ! 0%{?devel}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
 %endif
 
@@ -377,9 +383,12 @@
 
 
 %changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-3
+- Obsoletes: %%name ... to help out multilib upgrades
+
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-2
 - kde-3.5.8
-- omit -devel subpkg
+- omit -devel subpkg (f8+)
 
 * Thu Sep 27 2007 Than Ngo <than at redhat.com> -  3.5.7-6
 - fix build issue with new current glibc-2.6.90




More information about the fedora-extras-commits mailing list