rpms/kdegraphics/devel .cvsignore, 1.51, 1.52 kdegraphics.spec, 1.174, 1.175 sources, 1.58, 1.59 kdegraphics-4.1.2-libkdcraw-0.4.0.patch, 1.2, NONE kdegraphics-4.1.2-libkexiv2-0.4.0.patch, 1.2, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdegraphics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5857

Modified Files:
	.cvsignore kdegraphics.spec sources 
Removed Files:
	kdegraphics-4.1.2-libkdcraw-0.4.0.patch 
	kdegraphics-4.1.2-libkexiv2-0.4.0.patch 
Log Message:
4.2 beta1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	26 Sep 2008 23:48:45 -0000	1.51
+++ .cvsignore	20 Nov 2008 14:57:51 -0000	1.52
@@ -1 +1,2 @@
 kdegraphics-4.1.2.tar.bz2
+kdegraphics-4.1.80.tar.bz2


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/kdegraphics.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kdegraphics.spec	13 Nov 2008 14:27:25 -0000	1.174
+++ kdegraphics.spec	20 Nov 2008 14:57:51 -0000	1.175
@@ -1,12 +1,11 @@
-
 %if 0%{?fedora} < 10
 %define omit_kde3_conflicts 1
 %endif
 
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
-Version:        4.1.2
-Release:        4%{?dist}.1
+Version:        4.1.80
+Release:        2%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -20,18 +19,7 @@
 
 ## upstream patches
 
-## kipi framework backports from trunk (4.2)
-## don't bother updating these, rediff them from the next tag instead!
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkexiv2 \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkexiv2 >kdegraphics-4.1.2-libkexiv2-0.4.0.patch
-Patch200: kdegraphics-4.1.2-libkexiv2-0.4.0.patch
-# LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/4.1.2/kdegraphics/libs/libkdcraw \
-# svn://anonsvn.kde.org/home/kde/trunk/KDE/kdegraphics/libs/libkdcraw >kdegraphics-4.1.2-libkdcraw-0.4.0.patch
-Patch201: kdegraphics-4.1.2-libkdcraw-0.4.0.patch
-
-BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
-BuildRequires:  cmake
 BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
 BuildRequires:  exiv2-devel
@@ -57,7 +45,7 @@
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kdelibs4 >= %{version}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: cups 
+Requires: cups
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
@@ -102,15 +90,6 @@
 %setup -q -n kdegraphics-%{version}
 
 # upstream patches
-# libkexiv2 0.4.0 backport
-pushd libs/libkexiv2
-%patch200 -p0
-popd
-# libkdcraw 0.4.0 backport
-pushd libs/libkdcraw
-%patch201 -p0
-popd
-
 
 %build
 
@@ -169,18 +148,15 @@
 %{_kde4_appsdir}/kruler/
 %{_kde4_appsdir}/svgpart/*
 %{_datadir}/dbus-1/interfaces/*
-%{_kde4_docdir}/HTML/en/gwenview/
-%{_kde4_docdir}/HTML/en/kamera/
-%{_kde4_docdir}/HTML/en/ksnapshot/
-%{_kde4_docdir}/HTML/en/kolourpaint/
-%{_kde4_docdir}/HTML/en/kruler/
-%{_kde4_docdir}/HTML/en/kgamma/
+%{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
 
-%files libs 
+%files libs
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/kipi/
 %{_kde4_appsdir}/libkdcraw/
+# Not there anymore
+#%{_kde4_libdir}/libkdcraw5/
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %{_kde4_libdir}/strigi/*
@@ -201,6 +177,17 @@
 
 
 %changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 7:4.1.72-1
+- 4.1.80
+- BR cmake >= 2.6.2
+- make install/fast
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
 * Wed Oct 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-4
 - respin libkexiv2/libkdcraw backport patches
 
@@ -360,7 +347,7 @@
 - remove all but okular on fedora <= 9
 - +BR: kde4-macros(api)
 - remove unneeded require for kdepimlibs
-- add defattr to devel package 
+- add defattr to devel package
 
 * Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> 7:3.96.0-2
 - re-added epoch (from kdegraphics3)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	6 Oct 2008 21:04:49 -0000	1.58
+++ sources	20 Nov 2008 14:57:51 -0000	1.59
@@ -1 +1 @@
-f29e68dfe91cc0d2a5fbe2e4f7920054  kdegraphics-4.1.2.tar.bz2
+17560a0c7df4e22eb12031050498961c  kdegraphics-4.1.80.tar.bz2


--- kdegraphics-4.1.2-libkdcraw-0.4.0.patch DELETED ---


--- kdegraphics-4.1.2-libkexiv2-0.4.0.patch DELETED ---