rpms/gnome-do/devel gnome-do-0.5.0.1-keyring.patch, NONE, 1.1 gnome-do-0.5.0.1-launcher.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gnome-do.spec, 1.13, 1.14 sources, 1.6, 1.7 gnome-do-libdir.patch, 1.4, NONE

Michel Alexandre Salim (salimma) fedora-extras-commits at redhat.com
Tue Jul 15 13:53:06 UTC 2008 

Author: salimma

Update of /cvs/pkgs/rpms/gnome-do/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27300

Modified Files:
	.cvsignore gnome-do.spec sources 
Added Files:
	gnome-do-0.5.0.1-keyring.patch gnome-do-0.5.0.1-launcher.patch 
Removed Files:
	gnome-do-libdir.patch 
Log Message:
* Sun Jul  6 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.5.0.1-1
- Update to 0.5.0.1


gnome-do-0.5.0.1-keyring.patch:

--- NEW FILE gnome-do-0.5.0.1-keyring.patch ---
--- gnome-do-0.5.0.1/configure.keyring	2008-06-10 00:16:23.000000000 -0400
+++ gnome-do-0.5.0.1/configure	2008-07-06 21:27:32.000000000 -0400
@@ -22036,12 +22036,12 @@
         pkg_cv_GNOME_KEYRING_SHARP_CFLAGS="$GNOME_KEYRING_SHARP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOME_KEYRING_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-sharp" 2>/dev/null`
+  pkg_cv_GNOME_KEYRING_SHARP_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-sharp-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22054,12 +22054,12 @@
         pkg_cv_GNOME_KEYRING_SHARP_LIBS="$GNOME_KEYRING_SHARP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-keyring-sharp-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gnome-keyring-sharp-1.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GNOME_KEYRING_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-keyring-sharp" 2>/dev/null`
+  pkg_cv_GNOME_KEYRING_SHARP_LIBS=`$PKG_CONFIG --libs "gnome-keyring-sharp-1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22078,14 +22078,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-sharp"`
+	        GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-keyring-sharp-1.0"`
         else
-	        GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-sharp"`
+	        GNOME_KEYRING_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-keyring-sharp-1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_KEYRING_SHARP_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-sharp) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (gnome-keyring-sharp-1.0) were not met:
 
 $GNOME_KEYRING_SHARP_PKG_ERRORS
 
@@ -22096,7 +22096,7 @@
 and GNOME_KEYRING_SHARP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (gnome-keyring-sharp) were not met:
+echo "$as_me: error: Package requirements (gnome-keyring-sharp-1.0) were not met:
 
 $GNOME_KEYRING_SHARP_PKG_ERRORS
 
--- gnome-do-0.5.0.1/Do.Addins/Makefile.in.keyring	2008-06-10 00:24:01.000000000 -0400
+++ gnome-do-0.5.0.1/Do.Addins/Makefile.in	2008-07-06 21:28:10.000000000 -0400
@@ -336,7 +336,7 @@
 	-pkg:gconf-sharp-2.0 \
 	-pkg:glib-sharp-2.0 \
 	-pkg:gnome-desktop-sharp-2.0 \
-	-pkg:gnome-keyring-sharp \
+	-pkg:gnome-keyring-sharp-1.0 \
 	-pkg:gnome-sharp-2.0 \
 	-pkg:gnome-vfs-sharp-2.0 \
 	-pkg:gtk-sharp-2.0 \

gnome-do-0.5.0.1-launcher.patch:

--- NEW FILE gnome-do-0.5.0.1-launcher.patch ---
--- gnome-do-0.5.0.1/Do/gnome-do.in.launcher	2008-06-09 20:48:11.000000000 -0400
+++ gnome-do-0.5.0.1/Do/gnome-do.in	2008-07-06 21:29:51.000000000 -0400
@@ -1,15 +1,6 @@
 #!/bin/sh
 
-SCRIPT_PATH=`dirname $0`
-SCRIPT_PATH=`cd $SCRIPT_PATH; pwd`
-
-if [ "x$SCRIPT_PATH" = "x at abs_srcdir@/bin/Debug" ] ||
-   [ "x$SCRIPT_PATH" = "x at abs_srcdir@" ] ; then
-    echo "*** Running uninstalled ***"
-    GNOME_DO_EXE="@abs_srcdir@/bin/Debug/Do.exe"
-else
-    GNOME_DO_EXE="@expanded_libdir@/@PACKAGE@/Do.exe"
-fi
+GNOME_DO_EXE="@expanded_libdir@/@PACKAGE@/Do.exe"
 
 # Send the dbus Summon signal right away for fastest response if
 # Do is already running.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2008 22:09:37 -0000	1.6
+++ .cvsignore	15 Jul 2008 13:52:19 -0000	1.7
@@ -1 +1 @@
-gnome-do-0.4.2.0.tar.gz
+gnome-do-0.5.0.1.tar.gz


Index: gnome-do.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/gnome-do.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-do.spec	14 Jul 2008 10:48:37 -0000	1.13
+++ gnome-do.spec	15 Jul 2008 13:52:19 -0000	1.14
@@ -1,15 +1,17 @@
 %define			debug_package %{nil}
 
 Name:			gnome-do
-Version:		0.4.2.0
-Release:		2.1%{?dist}
+Version:		0.5.0.1
+Release:		1%{?dist}
 Summary:		Quick launch and search
 
 License:		GPLv3+
 Group:			Applications/File	
 URL:			http://do.davebsd.com/
-Source0:		http://do.davebsd.com/src/%{name}-%{version}.tar.gz
-Patch0:			%{name}-libdir.patch
+Source0:		http://launchpad.net/do/trunk/0.5/+download/%{name}-%{version}.tar.gz
+# keyring's .pc file has been renamed in latest CVS
+Patch0:			%{name}-0.5.0.1-keyring.patch
+Patch1:			%{name}-0.5.0.1-launcher.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
@@ -21,15 +23,16 @@
 BuildRequires:		ndesk-dbus-glib-devel
 BuildRequires:		gtk-sharp2-devel
 BuildRequires:		gnome-sharp-devel
+BuildRequires:		gnome-keyring-sharp-devel
 BuildRequires:		gettext
 BuildRequires:		perl-XML-Parser
 BuildRequires:		intltool
 BuildRequires:		gtk2-devel
 
 Requires:		mono-core
-Requires:		tomboy
 Requires:		ndesk-dbus
 Requires:		ndesk-dbus-glib
+Requires:		gnome-keyring-sharp
 Requires:		pkgconfig
 
 %description
@@ -48,15 +51,15 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .keyring
+%patch1 -p1 -b .launcher
 
-# fix libdir
-%patch0 -p1 -b .libdir
-
-%configure
 
 %build
+%configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -83,8 +86,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Mon Jul 14 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.4.2.0-2.1
-- rebuild
+* Sun Jul  6 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.5.0.1-1
+- Update to 0.5.0.1
 
 * Wed Jun 04 2008 Caolán McNamara <caolanm at redhat.com> - 0.4.2.0-2
 - rebuild for dependancies


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-do/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2008 22:09:37 -0000	1.6
+++ sources	15 Jul 2008 13:52:19 -0000	1.7
@@ -1 +1 @@
-14d9472dee8f6073adf0a6a3e60789f9  gnome-do-0.4.2.0.tar.gz
+1bc096b9ac6cd5fa30d5339be6dd6d9d  gnome-do-0.5.0.1.tar.gz


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

More information about the fedora-extras-commits mailing list