rpms/kdegraphics/F-9 kdegraphics.spec, 1.152, 1.153 sources, 1.48, 1.49 kdegraphics-4.1.0-kde#160860.patch, 1.1, NONE kdegraphics-4.1.0-printing-review-crash.patch, 1.1, NONE kdegraphics-4.1.0-update-configuration.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdegraphics/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30234

Modified Files:
	kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.1.0-kde#160860.patch 
	kdegraphics-4.1.0-printing-review-crash.patch 
	kdegraphics-4.1.0-update-configuration.patch 
Log Message:
4.1.1



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/kdegraphics.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- kdegraphics.spec	22 Aug 2008 17:04:16 -0000	1.152
+++ kdegraphics.spec	29 Aug 2008 19:07:16 -0000	1.153
@@ -4,8 +4,8 @@
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.0
-Release:        5%{?dist}
+Version:        4.1.1
+Release:        1%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -18,10 +18,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
-Patch100:       kdegraphics-4.1.0-printing-review-crash.patch
-Patch101:       kdegraphics-4.1.0-update-configuration.patch
-# http://bugs.kde.org/160860
-Patch102:       kdegraphics-4.1.0-kde#160860.patch
 
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
@@ -88,9 +84,9 @@
 ## FIXME: handle upgrade path for F-10 -- Rex 
 # remaining apps depending on these: kipi-plugins (me), kphotoalbum (me), 
 # showimg (mailed)
-Conflicts: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
-#Obsoletes: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
-#Provides:  libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2.0
+#Conflicts: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
+Obsoletes: libkdcraw-devel < 0.2.0, libkexiv2-devel < 0.2.0, libkipi-devel < 0.2.0 
+Provides:  libkdcraw-devel = 0.2.0, libkexiv2-devel = 0.2.0, libkipi-devel = 0.2.0
 %endif
 %description devel
 %{summary}.
@@ -100,10 +96,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-%patch100 -p1 -b .printing-review-crash
-%patch101 -p1 -b .update-configuration
-%patch102 -p1 -b .kde#160860
-
 
 %build
 
@@ -168,6 +160,7 @@
 %{_kde4_docdir}/HTML/en/ksnapshot/
 %{_kde4_docdir}/HTML/en/kolourpaint/
 %{_kde4_docdir}/HTML/en/kruler/
+%{_kde4_docdir}/HTML/en/kgamma/
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 %files libs 
@@ -195,6 +188,12 @@
 
 
 %changelog
+* Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
+- 4.1.1
+
+* Thu Aug 21 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-6
+- f10+: Obsoletes/Provides: libkdcraw-devel, libkexiv2-devel, libkipi-devel
+
 * Wed Aug 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-5
 - fix "last page is not printed" (kde #160860)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/F-9/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	29 Jul 2008 15:13:59 -0000	1.48
+++ sources	29 Aug 2008 19:07:16 -0000	1.49
@@ -1 +1 @@
-2488d850b66eba1b542bded3def3e87e  kdegraphics-4.1.0.tar.bz2
+e5475d37dc0a12b6ce7e6dbebceb9340  kdegraphics-4.1.1.tar.bz2


--- kdegraphics-4.1.0-kde#160860.patch DELETED ---


--- kdegraphics-4.1.0-printing-review-crash.patch DELETED ---


--- kdegraphics-4.1.0-update-configuration.patch DELETED ---