rpms/gnome-do/F-8 gnome-do-0.4.0.1-libdir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gnome-do.spec, 1.9, 1.10 sources, 1.4, 1.5 gnome-do-desktopfile.patch, 1.3, NONE gnome-do-libdir.patch, 1.3, NONE

Sat Mar 29 13:25:16 UTC 2008

Author: dnielsen

Update of /cvs/pkgs/rpms/gnome-do/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9267/F-8

Modified Files:
	.cvsignore gnome-do.spec sources 
Added Files:
	gnome-do-0.4.0.1-libdir.patch 
Removed Files:
	gnome-do-desktopfile.patch gnome-do-libdir.patch 
Log Message:
Bump to 0.4.0.1


gnome-do-0.4.0.1-libdir.patch:

--- NEW FILE gnome-do-0.4.0.1-libdir.patch ---
diff -uraN gnome-do-0.4.0.1.orig/Do/Do.exe.config.in gnome-do-0.4.0.1/Do/Do.exe.config.in
--- gnome-do-0.4.0.1.orig/Do/Do.exe.config.in	2008-03-29 12:15:13.033559861 +0100
+++ gnome-do-0.4.0.1/Do/Do.exe.config.in	2008-03-29 12:19:04.558800507 +0100
@@ -1,4 +1,4 @@
 <configuration>
 	<dllmap dll="libc" target="libc.so.6"/>
-	<dllmap dll="libdo" target="@prefix@/lib/@PACKAGE@/libdo.so"/>
+	<dllmap dll="libdo" target="@libdir@/@PACKAGE@/libdo.so"/>
 </configuration>
diff -uraN gnome-do-0.4.0.1.orig/Do/gnome-do.in gnome-do-0.4.0.1/Do/gnome-do.in
--- gnome-do-0.4.0.1.orig/Do/gnome-do.in	2008-03-29 12:15:13.043566443 +0100
+++ gnome-do-0.4.0.1/Do/gnome-do.in	2008-03-29 12:18:38.478801211 +0100
@@ -8,7 +8,7 @@
     echo "*** Running uninstalled ***"
     GNOME_DO_EXE="@abs_srcdir@/bin/Debug/Do.exe"
 else
-    GNOME_DO_EXE="@prefix@/lib/@PACKAGE@/Do.exe"
+    GNOME_DO_EXE="@libdir@/@PACKAGE@/Do.exe"
 fi
 
 # Send the dbus Summon signal right away for fastest response if
diff -uraN gnome-do-0.4.0.1.orig/Do/Makefile.in gnome-do-0.4.0.1/Do/Makefile.in
--- gnome-do-0.4.0.1.orig/Do/Makefile.in	2008-03-29 12:15:13.044550367 +0100
+++ gnome-do-0.4.0.1/Do/Makefile.in	2008-03-29 12:19:40.007550124 +0100
@@ -363,9 +363,9 @@
 bin_SCRIPTS = $(BINARIES)
 linuxdesktopapplicationsdir = @prefix@/share/applications
 linuxdesktopapplications_DATA = $(LINUX_DESKTOPAPPLICATIONS)
-programfilesdir = @prefix@/lib/@PACKAGE@
+programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
-linuxpkgconfigdir = @prefix@/lib/pkgconfig
+linuxpkgconfigdir = @libdir@/pkgconfig
 linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
 all: all-am
 
diff -uraN gnome-do-0.4.0.1.orig/Do.Addins/do.addins.pc.in gnome-do-0.4.0.1/Do.Addins/do.addins.pc.in
--- gnome-do-0.4.0.1.orig/Do.Addins/do.addins.pc.in	2008-03-29 12:15:13.030550260 +0100
+++ gnome-do-0.4.0.1/Do.Addins/do.addins.pc.in	2008-03-29 12:18:15.910803443 +0100
@@ -3,4 +3,4 @@
 Version: 0.1
 
 Requires: 
-Libs: -r:@prefix@/lib/@PACKAGE@/Do.Addins.dll
+Libs: -r:@libdir@/@PACKAGE@/Do.Addins.dll
diff -uraN gnome-do-0.4.0.1.orig/Do.Addins/Makefile.in gnome-do-0.4.0.1/Do.Addins/Makefile.in
--- gnome-do-0.4.0.1.orig/Do.Addins/Makefile.in	2008-03-29 12:15:13.030550260 +0100
+++ gnome-do-0.4.0.1/Do.Addins/Makefile.in	2008-03-29 12:17:52.423800629 +0100
@@ -349,9 +349,9 @@
 bin_SCRIPTS = $(BINARIES)
 linuxdesktopapplicationsdir = @prefix@/share/applications
 linuxdesktopapplications_DATA = $(LINUX_DESKTOPAPPLICATIONS)
-programfilesdir = @prefix@/lib/@PACKAGE@
+programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
-linuxpkgconfigdir = @prefix@/lib/pkgconfig
+linuxpkgconfigdir = @libdir@/pkgconfig
 linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
 all: all-am
 
diff -uraN gnome-do-0.4.0.1.orig/Do.DBus/do.dbus.pc.in gnome-do-0.4.0.1/Do.DBus/do.dbus.pc.in
--- gnome-do-0.4.0.1.orig/Do.DBus/do.dbus.pc.in	2008-03-29 12:15:13.007550124 +0100
+++ gnome-do-0.4.0.1/Do.DBus/do.dbus.pc.in	2008-03-29 12:15:39.758550251 +0100
@@ -3,4 +3,4 @@
 Version: 0.1
 
 Requires: 
-Libs: -r:@prefix@/lib/@PACKAGE@/Do.DBus.dll
+Libs: -r:@libdir@/@PACKAGE@/Do.DBus.dll
diff -uraN gnome-do-0.4.0.1.orig/Do.DBus/Makefile.in gnome-do-0.4.0.1/Do.DBus/Makefile.in
--- gnome-do-0.4.0.1.orig/Do.DBus/Makefile.in	2008-03-29 12:15:13.007550124 +0100
+++ gnome-do-0.4.0.1/Do.DBus/Makefile.in	2008-03-29 12:16:22.315801398 +0100
@@ -298,9 +298,9 @@
 bin_SCRIPTS = $(BINARIES)
 linuxdesktopapplicationsdir = @prefix@/share/applications
 linuxdesktopapplications_DATA = $(LINUX_DESKTOPAPPLICATIONS)
-programfilesdir = @prefix@/lib/@PACKAGE@
+programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
-linuxpkgconfigdir = @prefix@/lib/pkgconfig
+linuxpkgconfigdir = @libdir@/pkgconfig
 linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)
 all: all-am
 
diff -uraN gnome-do-0.4.0.1.orig/Makefile.include gnome-do-0.4.0.1/Makefile.include
--- gnome-do-0.4.0.1.orig/Makefile.include	2008-03-29 12:15:13.008553604 +0100
+++ gnome-do-0.4.0.1/Makefile.include	2008-03-29 12:17:17.014803841 +0100
@@ -31,7 +31,7 @@
 
 linuxdesktopapplicationsdir = @prefix@/share/applications
 linuxdesktopapplications_DATA = $(LINUX_DESKTOPAPPLICATIONS)
-programfilesdir = @prefix@/lib/@PACKAGE@
+programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
-linuxpkgconfigdir = @prefix@/lib/pkgconfig
+linuxpkgconfigdir = @libdir@/pkgconfig
 linuxpkgconfig_DATA = $(LINUX_PKGCONFIG)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Feb 2008 15:44:55 -0000	1.4
+++ .cvsignore	29 Mar 2008 13:24:36 -0000	1.5
@@ -1 +1 @@
-gnome-do-0.3.1.tar.gz
+gnome-do-0.4.0.1.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-8/gnome-do.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-do.spec	29 Feb 2008 20:03:04 -0000	1.9
+++ gnome-do.spec	29 Mar 2008 13:24:36 -0000	1.10
@@ -1,20 +1,19 @@
 %define			debug_package %{nil}
 
 Name:			gnome-do
-Version:		0.3.1
-Release:		4%{?dist}
+Version:		0.4.0.1
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			https://edge.launchpad.net/gc/
 Source0:		http://do.davebsd.com/src/%{name}-%{version}.tar.gz
-Patch0:			%{name}-libdir.patch
-Patch1:			%{name}-desktopfile.patch
+Patch0:			%{name}-%{version}-libdir.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# JIT only availible on these:
-ExclusiveArch:		%ix86 x86_64 ppc ia64 armv4l sparc alpha
+# Various Mono dependencies are not available for ppc64; see bug 241850.
+ExcludeArch:		ppc64
 
 BuildRequires:		mono-devel
 BuildRequires:		desktop-file-utils
@@ -25,6 +24,7 @@
 BuildRequires:		gettext
 BuildRequires:		perl-XML-Parser
 BuildRequires:		intltool
+BuildRequires:		gtk2-devel
 
 Requires:		mono-core
 Requires:		tomboy
@@ -52,9 +52,6 @@
 # fix libdir
 %patch0 -p1 -b .libdir
 
-# adjust .desktop, Version setting breaks spec.
-%patch1 -p1 -b .desktopfile
-
 %configure
 
 %build
@@ -85,12 +82,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Fri Feb 29 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.1-4
-- Actually do the jit change
-
-* Fri Feb 29 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.1-3
-- #432201 - try 2
-- Better excluding of non mono JIT archs
+* Sat Mar 29 2008 David Nielsen <gnomeuser at gmail.com> - 0.4.0.1-1
+- Bump to 0.4.0.1
+- Hopefully bring an end to the endless dups of 432201
 
 * Thu Feb 21 2008 David Nielsen <david at lovesunix.net> - 0.3.1-2
 - Fix 432201


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Feb 2008 15:44:55 -0000	1.4
+++ sources	29 Mar 2008 13:24:36 -0000	1.5
@@ -1 +1 @@
-f4c155a13d2f690f44d2a08caebdeb93  gnome-do-0.3.1.tar.gz
+ff3a5d225fd0f23d1357a1e0e461fded  gnome-do-0.4.0.1.tar.gz


--- gnome-do-desktopfile.patch DELETED ---


--- gnome-do-libdir.patch DELETED ---


