rpms/k3b/devel k3b.spec,1.56,1.57

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	k3b.spec 
Log Message:
* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.4-7
- f9+: Obsoletes: k3b-devel (#429613)



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- k3b.spec	19 Feb 2008 04:37:20 -0000	1.56
+++ k3b.spec	19 Feb 2008 15:08:41 -0000	1.57
@@ -14,7 +14,7 @@
 Summary: CD/DVD burning application for KDE
 Epoch:   0
 Version: 1.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -51,10 +51,13 @@
 
 Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
 Provides:  k3b-extras = %{epoch}:%{version}-%{release} 
-# imo, should be packaged separately, tis a shame to duplicate all this noarch
-# build/data on *every* arch.  -- Rex
+# imo, should be packaged separately, tis a shame to duplicate all 
+# this noarch build/data on *every* arch.  -- Rex
 Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
 Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
+%if ! 0%{?devel}
+Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
+%endif
 
 Requires: cdrecord mkisofs
 %if 0%{?fedora} > 3
@@ -72,12 +75,11 @@
 %if 0%{?devel}
 # afaik, nobody BR's it, and it pulls k3b into multilib -- Rex
 %package devel
-Summary: Files for the development of applications which will use k3b
+Summary: Files for the development of applications which will use %{name} 
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-
 %description devel
-Files for the development of applications, which will use k3b.
+%{summary}.
 %endif
 
 
@@ -235,6 +237,9 @@
 
 
 %changelog
+* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.4-7
+- f9+: Obsoletes: k3b-devel (#429613)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.0.4-6
 - Autorebuild for GCC 4.3