[dates] fix f14 build

Peter Robinson pbrobinson at fedoraproject.org
Wed Sep 8 13:37:57 UTC 2010


commit 69824fa8949a91151070b9ca7d2c3f210e6f27f2
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 8 14:37:57 2010 +0100

    fix f14 build

 dates-fixmake.patch |   11 +++++++++++
 dates.spec          |   33 +++++++++++++++++----------------
 2 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/dates-fixmake.patch b/dates-fixmake.patch
new file mode 100644
index 0000000..d589563
--- /dev/null
+++ b/dates-fixmake.patch
@@ -0,0 +1,11 @@
+--- dates-0.4.11/Makefile.in.orig	2010-09-08 13:46:51.556054164 +0100
++++ dates-0.4.11/Makefile.in	2010-09-08 13:47:29.980051583 +0100
+@@ -651,7 +651,7 @@
+ 
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/dates.spec b/dates.spec
index b733169..e5fb6e8 100644
--- a/dates.spec
+++ b/dates.spec
@@ -1,19 +1,19 @@
-Name:			dates
-Version:		0.4.11
-Release:		7%{?dist}
-Summary:		Small, lightweight calendar
-
-Group:			Applications/Productivity
-License:		GPLv2+
-URL:			http://pimlico-project.org/dates.html
-Source0:		ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
-Patch0:                 dates-fixdso.patch
-Patch1:                 dates-ftbfs.patch
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  	gtk2-devel
-BuildRequires:		evolution-data-server-devel
-BuildRequires:		desktop-file-utils intltool gettext
+Name:           dates
+Version:        0.4.11
+Release:        7%{?dist}
+Summary:        Small, lightweight calendar
+
+Group:          Applications/Productivity
+License:        GPLv2+
+URL:            http://pimlico-project.org/dates.html
+Source0:        ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.4/%{name}-%{version}.tar.bz2
+Patch0:         dates-fixdso.patch
+Patch1:         dates-ftbfs.patch
+Patch2:         dates-fixmake.patch
+
+BuildRequires:  gtk2-devel
+BuildRequires:  evolution-data-server-devel
+BuildRequires:  desktop-file-utils intltool gettext
 
 %description
 Dates is a small, lightweight calendar that uses Evolution Data Server as a
@@ -25,6 +25,7 @@ user interface and tailored support for the Nokia 770 maemo interface.
 %setup -q
 %patch0 -p1 -b .fixdso
 %patch1 -p1 -b .ftbfs
+%patch2 -p1 -b .fixmake
 
 %build
 %configure --disable-debug


More information about the scm-commits mailing list