rpms/gchempaint/devel doubledestdir.patch, NONE, 1.1 gchempaint.spec, 1.2, 1.3

[Julian Sikorski (belegdol)]

Author: belegdol

Update of /cvs/extras/rpms/gchempaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7107

Modified Files:
	gchempaint.spec 
Added Files:
	doubledestdir.patch 
Log Message:
Added temporary KDE mimelnk workaround

doubledestdir.patch:

--- NEW FILE doubledestdir.patch ---
--- gchempaint-0.6.7/Makefile.in.doubledestdir	2006-12-22 01:11:13.000000000 +0100
+++ gchempaint-0.6.7/Makefile.in	2006-12-22 01:12:50.000000000 +0100
@@ -311,7 +311,7 @@
 serverdir = $(libdir)/bonobo/servers
 server_DATA = gchempaint.server
 @WITH_KDE_DESKTOP_TRUE at kde_desktop_DATA = $(kde_desktop_in_files:.desktop.in=.desktop)
- at WITH_KDE_DESKTOP_TRUE@kde_desktopdir = $(DESTDIR)$(KDEDESKTOPDIR)/application
+ at WITH_KDE_DESKTOP_TRUE@kde_desktopdir = $(KDEDESKTOPDIR)/application
 distcleancheck_listfiles = \
 	find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
 


Index: gchempaint.spec
===================================================================
RCS file: /cvs/extras/rpms/gchempaint/devel/gchempaint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gchempaint.spec	21 Dec 2006 09:13:42 -0000	1.2
+++ gchempaint.spec	22 Dec 2006 00:15:26 -0000	1.3
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://www.nongnu.org/gchempaint/
 Source0:        http://download.savannah.nongnu.org/releases/gchempaint/%{name}-%{version}.tar.gz
+Patch0:         doubledestdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-chemistry-utils-devel
@@ -47,13 +48,14 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .doubledestdir
 
 
 %build
 %configure --disable-update-databases \
            --disable-schemas-install \
            --disable-scrollkeeper \
-           --with-kde-desktopdir=%{_datadir}/mimelnk/application
+           --with-kde-desktopdir=%{_datadir}/mimelnk
 make %{?_smp_mflags}
 
 
@@ -73,6 +75,7 @@
 rm -rf $RPM_BUILD_ROOT%{_includedir}/gchempaint
 rm -f $RPM_BUILD_ROOT%{_libdir}/libgchempaint.so
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -145,6 +148,7 @@
 * Thu Dec 21 2006 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.7-1
 - Updated to 0.6.7
 - Dropped upstreamed patches
+- Added temporary KDE mimelnk workaround
 
 * Fri Dec 08 2006 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.6.6-5
 - Added upstream patch #18159, fixing AMD64 startup crash