rpms/kdebindings/devel kdebindings-4.0.80-lib64.patch, 1.1, 1.2 kdebindings.spec, 1.105, 1.106

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Tue May 27 22:52:33 UTC 2008


Author: kkofler

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

Modified Files:
	kdebindings-4.0.80-lib64.patch kdebindings.spec 
Log Message:
Replace lib64 patch with the version I committed upstream, as the reversion of the old commit doesn't apply and it's not worth porting it.

kdebindings-4.0.80-lib64.patch:

Index: kdebindings-4.0.80-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.0.80-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebindings-4.0.80-lib64.patch	27 May 2008 21:13:25 -0000	1.1
+++ kdebindings-4.0.80-lib64.patch	27 May 2008 22:51:51 -0000	1.2
@@ -1,15 +1,13 @@
 Index: smoke/qt/CMakeLists.txt
 ===================================================================
---- smoke/qt/CMakeLists.txt	(Revision 804510)
-+++ smoke/qt/CMakeLists.txt	(Revision 804509)
-@@ -138,9 +138,7 @@
+--- smoke/qt/CMakeLists.txt	(Revision 813503)
++++ smoke/qt/CMakeLists.txt	(Revision 813504)
+@@ -144,7 +144,7 @@
  
- set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
- 
--# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
--# for Qt only installs
+ # Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
+ # for Qt only installs
 -install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
-+install(TARGETS smokeqt DESTINATION ${LIB_INSTALL_DIR} )
++install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+ install(FILES qt_smoke.h DESTINATION include/smoke/qt)
  
  configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
- configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- kdebindings.spec	27 May 2008 21:15:03 -0000	1.105
+++ kdebindings.spec	27 May 2008 22:51:51 -0000	1.106
@@ -17,15 +17,14 @@
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-# revert http://websvn.kde.org/?view=rev&revision=804510
-# This uses /usr/lib instead of /usr/lib64 as libdir on x86_64/ppc64.
-Patch0: kdebindings-4.0.80-lib64.patch
 # upstream patch to fix PyKDE4 build:
 # http://websvn.kde.org/?view=rev&revision=811888
 Patch100: kdebindings-4.0.80-fix-pykde4.patch
 # upstream patch to fix smokekde build:
 # http://websvn.kde.org/?view=rev&revision=811755
 Patch101: kdebindings-4.0.80-fix-smokekde.patch
+# use lib64 correctly: http://websvn.kde.org/?view=rev&revision=813504
+Patch102: kdebindings-4.0.80-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -72,9 +71,9 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .lib64
 %patch100 -p0 -b .fix-pykde4
 %patch101 -p0 -b .fix-smokekde
+%patch102 -p0 -b .lib64
 # get rid of this because it breaks the build without PHP
 # we don't want to build php-qt before we sorted out the dep explosion mess
 rm -rf php




More information about the fedora-extras-commits mailing list