rpms/kgtk/devel Makefile, 1.2, 1.3 kgtk-0.8-libkgtk_version.patch, 1.2, 1.3 kgtk-0.8-makefile_paths.patch, 1.2, 1.3 kgtk.spec, 1.2, 1.3 sources, 1.3, 1.4 dead.package, 1.1, NONE

Francois Aucamp (faucamp) fedora-extras-commits at redhat.com
Mon Jan 28 15:56:35 UTC 2008


Author: faucamp

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

Added Files:
	Makefile kgtk-0.8-libkgtk_version.patch 
	kgtk-0.8-makefile_paths.patch kgtk.spec sources 
Removed Files:
	dead.package 
Log Message:
Reverted - package should not be EOL



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	28 Jan 2008 15:55:57 -0000	1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: kgtk
+# $Id$
+NAME := kgtk
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

kgtk-0.8-libkgtk_version.patch:

Index: kgtk-0.8-libkgtk_version.patch
===================================================================
RCS file: kgtk-0.8-libkgtk_version.patch
diff -N kgtk-0.8-libkgtk_version.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kgtk-0.8-libkgtk_version.patch	28 Jan 2008 15:55:57 -0000	1.3
@@ -0,0 +1,11 @@
+diff -uNr kgtk-0.8/gtk/Makefile.in kgtk-0.8-mod/gtk/Makefile.in
+--- kgtk-0.8/gtk/Makefile.in	2007-01-25 09:45:23.000000000 +0200
++++ kgtk-0.8-mod/gtk/Makefile.in	2007-01-25 09:44:49.000000000 +0200
+@@ -324,6 +324,7 @@
+ INCLUDES = $(GTK_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)/kdialogd -DKDIALOGD_LOCATION=\"$(libkgtkdir)\"
+ libkgtk_LTLIBRARIES = libkgtk.la
+ libkgtk_la_SOURCES = kgtk.c
++libkgtk_la_LDFLAGS = -module -avoid-version
+ libkgtk_la_LIBADD = $(GTK_LIBS) $(GTHREAD_LIBS) -lc -ldl
+ EXTRA_DIST = kgtk-wrapper.in
+ wrapperdir = $(bindir)

kgtk-0.8-makefile_paths.patch:

Index: kgtk-0.8-makefile_paths.patch
===================================================================
RCS file: kgtk-0.8-makefile_paths.patch
diff -N kgtk-0.8-makefile_paths.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kgtk-0.8-makefile_paths.patch	28 Jan 2008 15:55:57 -0000	1.3
@@ -0,0 +1,36 @@
+diff -uNr kgtk-0.8/gtk/Makefile.in kgtk-0.8-mod/gtk/Makefile.in
+--- kgtk-0.8/gtk/Makefile.in	2006-09-05 23:33:52.000000000 +0200
++++ kgtk-0.8-mod/gtk/Makefile.in	2007-01-24 18:02:52.000000000 +0200
+@@ -320,7 +320,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-libkgtkdir = $(kde_datadir)/kgtk
++libkgtkdir = $(libdir)/kgtk
+ INCLUDES = $(GTK_CFLAGS) $(GTHREAD_CFLAGS) -I$(top_srcdir)/kdialogd -DKDIALOGD_LOCATION=\"$(libkgtkdir)\"
+ libkgtk_LTLIBRARIES = libkgtk.la
+ libkgtk_la_SOURCES = kgtk.c
+diff -uNr kgtk-0.8/kdialogd/Makefile.in kgtk-0.8-mod/kdialogd/Makefile.in
+--- kgtk-0.8/kdialogd/Makefile.in	2006-09-05 23:33:52.000000000 +0200
++++ kgtk-0.8-mod/kdialogd/Makefile.in	2007-01-24 18:03:46.000000000 +0200
+@@ -360,7 +360,7 @@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = -I$(srcdir)/.. $(all_includes)
+ #>- METASOURCES = AUTO
+- at compile_as_kde_app_TRUE@kdialogddir = $(kde_datadir)/kgtk
++ at compile_as_kde_app_TRUE@kdialogddir = $(libdir)/kgtk
+ @compile_as_kde_app_TRUE at kdialogd_SOURCES = kdialogd.cpp
+ @compile_as_kde_app_TRUE at kdialogd_LDFLAGS = $(all_libraries)
+ @compile_as_kde_app_TRUE at kdialogd_LDADD = $(LIB_KDECORE) $(LIB_KIO)
+diff -uNr kgtk-0.8/qt/Makefile.in kgtk-0.8-mod/qt/Makefile.in
+--- kgtk-0.8/qt/Makefile.in	2006-09-05 23:33:52.000000000 +0200
++++ kgtk-0.8-mod/qt/Makefile.in	2007-01-24 18:04:34.000000000 +0200
+@@ -330,7 +330,7 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-libkqtdir = $(kde_datadir)/kgtk
++libkqtdir = $(libdir)/kgtk
+ INCLUDES = $(QT_INCLUDES) -I$(top_srcdir)/kdialogd -I$(top_srcdir)/gtk -DKDIALOGD_LOCATION=\"$(libkqtdir)\"
+ libkqt_LTLIBRARIES = libkqt.la
+ libkqt_la_SOURCES = kqt.cpp


Index: kgtk.spec
===================================================================
RCS file: kgtk.spec
diff -N kgtk.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ kgtk.spec	28 Jan 2008 15:55:57 -0000	1.3
@@ -0,0 +1,65 @@
+Name:           kgtk
+Version:        0.8
+Release:        2%{?dist}
+Summary:        Allows Gtk and Qt applications to use KDE's file dialogs
+
+Group:          System Environment/Libraries
+License:        GPL
+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
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  kdelibs-devel gtk2-devel automake
+
+%description
+This is an LD_PRELOAD library that allows Gtk and Qt applications (such as
+Firefox, Evolution, Eclipse, etc) to use KDE's file dialogs.
+
+When a Gtk/Qt app is executed, it starts the kdialogd app (if not already
+started), and communicates with this via a UNIX domain socket. There will only
+ever be one instance of kdialogd, and all apps communicate with the same
+instance - and it terminates itself 30 seconds after the last Gtk/Qt app has
+disconnected.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .makefile_paths
+%patch1 -p1 -b .libkgtk_version
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+# Remove libtool archives
+rm -f %{buildroot}%{_libdir}/kgtk/*.la
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/kgtk-wrapper
+%{_bindir}/kqt-wrapper
+%{_libdir}/kgtk
+
+
+%changelog
+* 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
+
+* 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: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	28 Jan 2008 15:55:57 -0000	1.4
@@ -0,0 +1 @@
+2cde8a09508773cf2f9028912be4fbbe  kgtk-0.8.tar.gz


--- dead.package DELETED ---




More information about the fedora-extras-commits mailing list