rpms/kgtk/F-8 kgtk-0.9.4-intptr_t.patch, NONE, 1.1 kgtk-0.9.4-kdelibs4.0_kconfig_api.patch, NONE, 1.1 kgtk-0.9.4-open_O_CREAT_parameters.patch, NONE, 1.1 kgtk.spec, 1.1, 1.2 sources, 1.2, 1.3 kgtk-0.8-libkgtk_version.patch, 1.1, NONE kgtk-0.8-makefile_paths.patch, 1.1, NONE

Tue Jan 29 13:54:11 UTC 2008

Author: faucamp

Update of /cvs/pkgs/rpms/kgtk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4639

Modified Files:
	kgtk.spec sources 
Added Files:
	kgtk-0.9.4-intptr_t.patch 
	kgtk-0.9.4-kdelibs4.0_kconfig_api.patch 
	kgtk-0.9.4-open_O_CREAT_parameters.patch 
Removed Files:
	kgtk-0.8-libkgtk_version.patch kgtk-0.8-makefile_paths.patch 
Log Message:
clog

kgtk-0.9.4-intptr_t.patch:

--- NEW FILE kgtk-0.9.4-intptr_t.patch ---
diff -uNr KGtk-0.9.4/kdialogd4/kdialogd.cpp KGtk-0.9.4-mod/kdialogd4/kdialogd.cpp
--- KGtk-0.9.4/kdialogd4/kdialogd.cpp	2007-10-31 22:33:19.000000000 +0200
+++ KGtk-0.9.4-mod/kdialogd4/kdialogd.cpp	2008-01-29 09:57:57.000000000 +0200
@@ -11,6 +11,7 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kurlcombobox.h>
+#include <stdint.h>
 #ifdef USE_KWIN
 #include <kwindowsystem.h>
 #else
@@ -382,7 +383,7 @@
     // * the dir select dialog doesnt seem to set the QDialog result parameter
     //   when it is accepted - so for this reason if ok is clicked we store an
     //   'accepted' value there, and check for that after the dialog is finished.
-    kDebug() << "finished " << (int)itsDlg << itsAccepted << (itsDlg ? QDialog::Accepted==itsDlg->result() : false);
+    kDebug() << "finished " << (intptr_t)itsDlg << itsAccepted << (itsDlg ? QDialog::Accepted==itsDlg->result() : false);
 
     if(itsDlg && !(itsAccepted || QDialog::Accepted==itsDlg->result()))
         cancel();

kgtk-0.9.4-kdelibs4.0_kconfig_api.patch:

--- NEW FILE kgtk-0.9.4-kdelibs4.0_kconfig_api.patch ---
diff -uNr KGtk-0.9.4/kdialogd4/kdialogd.cpp KGtk-0.9.4-mod/kdialogd4/kdialogd.cpp
--- KGtk-0.9.4/kdialogd4/kdialogd.cpp	2008-01-29 10:20:14.000000000 +0200
+++ KGtk-0.9.4-mod/kdialogd4/kdialogd.cpp	2008-01-29 10:28:06.000000000 +0200
@@ -169,7 +169,7 @@
     else
     {
         if(!theirConfig)
-            theirConfig=new KConfig("kdialogd4rc", KConfig::OnlyLocal);
+            theirConfig=new KConfig("kdialogd4rc", KConfig::NoGlobals);
 
         connect(new QSocketNotifier(itsFd, QSocketNotifier::Read, this),
                 SIGNAL(activated(int)), this, SLOT(newConnection()));

kgtk-0.9.4-open_O_CREAT_parameters.patch:

--- NEW FILE kgtk-0.9.4-open_O_CREAT_parameters.patch ---
diff -uNr KGtk-0.9.4/common/common.h KGtk-0.9.4-mod/common/common.h
--- KGtk-0.9.4/common/common.h	2007-10-31 22:33:19.000000000 +0200
+++ KGtk-0.9.4-mod/common/common.h	2008-01-28 17:39:09.000000000 +0200
@@ -165,7 +165,7 @@
 {
     do
     {
-        lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL);
+        lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
         if (lockFd<0 && errno==EEXIST)
         {
             /* Hmm, lock file already exists. Is it stale? */


Index: kgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kgtk/F-8/kgtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kgtk.spec	26 Jan 2007 07:03:09 -0000	1.1
+++ kgtk.spec	29 Jan 2008 13:53:33 -0000	1.2
@@ -1,17 +1,41 @@
+%if 0%{?fedora} >= 9
+    %define locale_name kdialogd4
+%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.8
+Version:        0.9.4
 Release:        2%{?dist}
 Summary:        Allows Gtk and Qt applications to use KDE's file dialogs
 
 Group:          System Environment/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://www.kde-apps.org/content/show.php?content=36077
-Source0:        http://home.freeuk.com/cpdrummond/%{name}-%{version}.tar.gz
-Patch0:         kgtk-0.8-makefile_paths.patch
-Patch1:         kgtk-0.8-libkgtk_version.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdelibs-devel gtk2-devel automake
+BuildRequires:  kdelibs-devel gtk2-devel cmake gettext
+
 
 %description
 This is an LD_PRELOAD library that allows Gtk and Qt applications (such as
@@ -25,36 +49,54 @@
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .makefile_paths
-%patch1 -p1 -b .libkgtk_version
+%setup -q -n KGtk-%{version}
+%patch0 -p1 -b .open_O_CREAT_parameters
+%patch1 -p1 -b .intptr_t
+%patch2 -p1 -b .kdelibs4.0_kconfig_api
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%if 0%{?fedora} >= 9
+    %cmake -DKGTK_KDE4=true -DKGTK_KDE3=false .
+%else
+    %cmake -DKGTK_KDE3=true .
+%endif
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-# Remove libtool archives
-rm -f %{buildroot}%{_libdir}/kgtk/*.la
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{locale_name}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{locale_name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
-%{_bindir}/kgtk-wrapper
-%{_bindir}/kqt-wrapper
+%doc AUTHORS ChangeLog COPYING README TODO
+%{_bindir}/*
 %{_libdir}/kgtk
 
 
 %changelog
+* Tue Jan 29 2008 Francois Aucamp <faucamp at fedoraproject.org> - 0.9.4-2
+- Added "intptr_t" patch to fix pointer-to-int conversion bug on 64-bit archs
+- Added "kdelibs4.0_kconfig_api" patch to sync KConfig API to kdelibs 4.0 for F9+
+
+* Mon Jan 28 2008 Francois Aucamp <faucamp at fedoraproject.org> - 0.9.4-1
+- Update to version 0.9.4
+- Dropped obsolete autotools patches
+- Added conditional builds for KDE4 (F9+) and KDE3 (F8-)
+- Added cmake lib64 suffix macro (to be removed if the global RPM cmake macros are accepted)
+- Added TODO to package docs
+- Added %%find_lang macro to gather locale files
+- Changed License field from GPL to GPLv2+
+- Added %%cmake macro to spec (until the macro is accepted globally in RPM)
+- Added "open_O_CREAT_parameters" patch to fix usage of open()
+
 * Thu Jan 25 2007 Francois Aucamp <faucamp at csir.co.za> - 0.8-2
 - Created patch to prevent useless libkgtk.so.* symlinks during %%build
 - Added package name/version prefix to patch filenames
@@ -62,4 +104,3 @@
 * Wed Jan 24 2007 Francois Aucamp <faucamp at csir.co.za> - 0.8-1
 - Initial RPM build
 - Created patch for makefile to use correct installation paths
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kgtk/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2007 07:03:09 -0000	1.2
+++ sources	29 Jan 2008 13:53:33 -0000	1.3
@@ -1 +1 @@
-2cde8a09508773cf2f9028912be4fbbe  kgtk-0.8.tar.gz
+a6fde9e4520e1f347ff6a48cda95337a  KGtk-0.9.4.tar.bz2


--- kgtk-0.8-libkgtk_version.patch DELETED ---


--- kgtk-0.8-makefile_paths.patch DELETED ---


