rpms/kcoloredit/F-12 kcoloredit-2.0.0-kde4.4.0-ftbfs.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 kcoloredit.spec, 1.21, 1.22 sources, 1.15, 1.16

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kcoloredit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5633/F-12

Modified Files:
	.cvsignore kcoloredit.spec sources 
Added Files:
	kcoloredit-2.0.0-kde4.4.0-ftbfs.patch 
Log Message:
Sync from devel:

* Sat Feb 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-2
- fix FTBFS with the new stricter ld in F13 (#564815): explicitly link libX11

* Fri Feb 12 2010 Sebastian Vahl <svahl at fedoraproject.org> - 4.4.0-1
- 4.4.0

* Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-2
- rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)

kcoloredit-2.0.0-kde4.4.0-ftbfs.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kcoloredit-2.0.0-kde4.4.0-ftbfs.patch ---
diff -ur kcoloredit-2.0.0-kde4.4.0/src/CMakeLists.txt kcoloredit-2.0.0-kde4.4.0-ftbfs/src/CMakeLists.txt
--- kcoloredit-2.0.0-kde4.4.0/src/CMakeLists.txt	2010-02-11 21:40:05.000000000 +0100
+++ kcoloredit-2.0.0-kde4.4.0-ftbfs/src/CMakeLists.txt	2010-02-13 20:07:44.000000000 +0100
@@ -56,6 +56,6 @@
 
 kde4_add_executable ( kcoloredit ${kcoloredit_SRCS} )
 
-target_link_libraries ( kcoloredit ${KDE4_KFILE_LIBS} )
+target_link_libraries ( kcoloredit ${KDE4_KFILE_LIBS} X11 )
 
 install (TARGETS kcoloredit  ${INSTALL_TARGETS_DEFAULT_ARGS} )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kcoloredit/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	12 Nov 2009 14:48:38 -0000	1.14
+++ .cvsignore	13 Feb 2010 19:21:04 -0000	1.15
@@ -1 +1 @@
-kcoloredit-2.0.0-kde4.3.3.tar.bz2
+kcoloredit-2.0.0-kde4.4.0.tar.bz2


Index: kcoloredit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kcoloredit/F-12/kcoloredit.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kcoloredit.spec	12 Nov 2009 14:48:38 -0000	1.21
+++ kcoloredit.spec	13 Feb 2010 19:21:04 -0000	1.22
@@ -4,14 +4,16 @@
 %define iversion 2.0.0
 
 Name:           kcoloredit
-Version:        4.3.3
-Release:        1%{?dist}
+Version:        4.4.0
+Release:        2%{?dist}
 Summary:        A color palette Editor
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/kcoloredit-%{iversion}-kde%{version}.tar.bz2
+# fix FTBFS with the new stricter ld in F13 (#564815): explicitly link libX11
+Patch0:         kcoloredit-2.0.0-kde4.4.0-ftbfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -31,6 +33,7 @@ color palettes and for color choosing an
 
 %prep
 %setup -qn kcoloredit-%{iversion}-kde%{version}
+%patch0 -p1 -b .ftbfs
 
 %build
 
@@ -83,6 +86,15 @@ xdg-icon-resource forceupdate --theme hi
 %{_kde4_iconsdir}/hicolor/*/*/kcoloredit.png
 
 %changelog
+* Sat Feb 13 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-2
+- fix FTBFS with the new stricter ld in F13 (#564815): explicitly link libX11
+
+* Fri Feb 12 2010 Sebastian Vahl <svahl at fedoraproject.org> - 4.4.0-1
+- 4.4.0
+
+* Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-2
+- rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+
 * Thu Nov 05 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.3-1
 - 4.3.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kcoloredit/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Nov 2009 14:48:38 -0000	1.15
+++ sources	13 Feb 2010 19:21:04 -0000	1.16
@@ -1 +1 @@
-4d60fc4dfb10dde69877827d8a9fcd29  kcoloredit-2.0.0-kde4.3.3.tar.bz2
+c28d476835caefc3736bcac912554cb5  kcoloredit-2.0.0-kde4.4.0.tar.bz2