rpms/kgtk/devel kgtk-0.10.1-kgtk2_wrapper_lib_suffix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kgtk.spec, 1.10, 1.11 sources, 1.5, 1.6 kgtk-0.9.4-intptr_t.patch, 1.1, NONE kgtk-0.9.4-kdelibs4.0_kconfig_api.patch, 1.1, NONE kgtk-0.9.4-kgtk-wrapper_gtk2_detection.patch, 1.1, NONE kgtk-0.9.4-open_O_CREAT_parameters.patch, 1.1, NONE

Francois Aucamp faucamp at fedoraproject.org
Tue Jun 30 09:32:36 UTC 2009 

Author: faucamp

Update of /cvs/pkgs/rpms/kgtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25081

Modified Files:
	.cvsignore kgtk.spec sources 
Added Files:
	kgtk-0.10.1-kgtk2_wrapper_lib_suffix.patch 
Removed Files:
	kgtk-0.9.4-intptr_t.patch 
	kgtk-0.9.4-kdelibs4.0_kconfig_api.patch 
	kgtk-0.9.4-kgtk-wrapper_gtk2_detection.patch 
	kgtk-0.9.4-open_O_CREAT_parameters.patch 
Log Message:
* Tue Jun 30 2009 Francois Aucamp <faucamp at fedoraproject.org> - 0.10.1-1
- Update to version 0.10.1
- Added "kgtk2_wrapper_lib_suffix" patch to fix libdir locations on x86_64 (RHBZ #508733)
- Added explicit Requires: kdebase-runtime (for kreadconfig)
- Removed old bundled %cmake macros from spec
- Dropped obsolete "open_O_CREAT_parameters" patch (included upstream)
- Dropped obsolete "intptr_t" patch (fixed upstream)
- Dropped obsolete "kgtk-wrapper-gtk2_detection" patch (included upstream)


kgtk-0.10.1-kgtk2_wrapper_lib_suffix.patch:

--- NEW FILE kgtk-0.10.1-kgtk2_wrapper_lib_suffix.patch ---
diff -uNr KGtk-0.10.1/gtk2/kgtk2-wrapper.cmake KGtk-0.10.1-mod/gtk2/kgtk2-wrapper.cmake
--- KGtk-0.10.1/gtk2/kgtk2-wrapper.cmake	2009-03-12 02:19:40.000000000 +0200
+++ KGtk-0.10.1-mod/gtk2/kgtk2-wrapper.cmake	2009-06-30 10:02:09.301162418 +0200
@@ -19,7 +19,7 @@
 app=`basename $0`
 
 if [ "$app" = "kgtk2-wrapper" ] ; then
-    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib/kgtk/libkgtk2.so:$LD_PRELOAD "$@"
+    LD_PRELOAD=@CMAKE_INSTALL_PREFIX@/lib at LIB_SUFFIX@/kgtk/libkgtk2.so:$LD_PRELOAD "$@"
 else
     dir=`dirname $0`
     oldPath=$PATH


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kgtk/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	28 Jan 2008 16:05:36 -0000	1.3
+++ .cvsignore	30 Jun 2009 09:32:05 -0000	1.4
@@ -1 +1 @@
-KGtk-0.9.4.tar.bz2
+KGtk-0.10.1.tar.bz2


Index: kgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kgtk/devel/kgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kgtk.spec	25 Feb 2009 11:15:02 -0000	1.10
+++ kgtk.spec	30 Jun 2009 09:32:05 -0000	1.11
@@ -3,38 +3,19 @@
 %else
     %define locale_name kdialogd3
 %endif
-## /etc/rpm/macros.cmake: -- adapted from the CMake packaging draft macro:
-# http://fedoraproject.org/wiki/Packaging/cmake
-%define _cmake_lib_suffix64 -DLIB_SUFFIX=64
-%define __cmake %{_bindir}/cmake
-
-%define cmake \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  %__cmake \\\
-%if "%{?_lib}" == "lib64" \
-        %{?_cmake_lib_suffix64} \\\
-%endif \
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON
-
-
 Name:           kgtk
-Version:        0.9.4
-Release:        4%{?dist}
+Version:        0.10.1
+Release:        1%{?dist}
 Summary:        Allows Gtk and Qt applications to use KDE's file dialogs
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php?content=36077
 Source0:        http://home.freeuk.com/cpdrummond/KGtk-%{version}.tar.bz2
-Patch0:         kgtk-0.9.4-open_O_CREAT_parameters.patch
-Patch1:         kgtk-0.9.4-intptr_t.patch
-Patch2:         kgtk-0.9.4-kdelibs4.0_kconfig_api.patch
-Patch3:         kgtk-0.9.4-kgtk-wrapper_gtk2_detection.patch
+Patch0:         kgtk-0.10.1-kgtk2_wrapper_lib_suffix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires:       kdebase-runtime
 BuildRequires:  kdelibs-devel gtk2-devel cmake gettext
 
 
@@ -51,10 +32,7 @@ disconnected.
 
 %prep
 %setup -q -n KGtk-%{version}
-%patch0 -p1 -b .open_O_CREAT_parameters
-%patch1 -p1 -b .intptr_t
-%patch2 -p1 -b .kdelibs4.0_kconfig_api
-%patch3 -p1 -b .kgtk-wrapper_gtk2_detection
+%patch0 -p1 -b .kgtk2_wrapper_lib_suffix
 
 
 %build
@@ -84,6 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 30 2009 Francois Aucamp <faucamp at fedoraproject.org> - 0.10.1-1
+- Update to version 0.10.1
+- Added "kgtk2_wrapper_lib_suffix" patch to fix libdir locations on x86_64 (RHBZ #508733)
+- Added explicit Requires: kdebase-runtime (for kreadconfig)
+- Removed old bundled %%cmake macros from spec
+- Dropped obsolete "open_O_CREAT_parameters" patch (included upstream)
+- Dropped obsolete "intptr_t" patch (fixed upstream)
+- Dropped obsolete "kgtk-wrapper-gtk2_detection" patch (included upstream)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kgtk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Jan 2008 16:05:36 -0000	1.5
+++ sources	30 Jun 2009 09:32:05 -0000	1.6
@@ -1 +1 @@
-a6fde9e4520e1f347ff6a48cda95337a  KGtk-0.9.4.tar.bz2
+b456046727f0120734410573d75c47e0  KGtk-0.10.1.tar.bz2


--- kgtk-0.9.4-intptr_t.patch DELETED ---


--- kgtk-0.9.4-kdelibs4.0_kconfig_api.patch DELETED ---


--- kgtk-0.9.4-kgtk-wrapper_gtk2_detection.patch DELETED ---


--- kgtk-0.9.4-open_O_CREAT_parameters.patch DELETED ---

More information about the fedora-extras-commits mailing list