[cinnamon] fix automake warning
leigh123linux
leigh123linux at fedoraproject.org
Thu Jul 25 14:18:56 UTC 2013
commit 4470ef3af46b589af8fc71e4f01f0c6bf4661b20
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Thu Jul 25 15:18:34 2013 +0100
fix automake warning
automake_14.patch | 22 ++++++++++++++++++++++
cinnamon.spec | 13 +++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/automake_14.patch b/automake_14.patch
new file mode 100644
index 0000000..f6442db
--- /dev/null
+++ b/automake_14.patch
@@ -0,0 +1,22 @@
+--- a/m4/po.m4
++++ b/m4/po.m4
+@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+ [
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
++ AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Release version of the gettext macros. This is used to ensure that
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,7 +21,7 @@ service_DATA = $(service_in_files:.servi
+
+ %.service: %.service.in Makefile
+ $(AM_V_GEN) \
+- [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
++ [ -d $(@D) ] || $(MKDIR_P) $(@D) ; \
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" \
+ -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@.tmp && mv $@.tmp $@
+
diff --git a/cinnamon.spec b/cinnamon.spec
index bf4dd71..61b5c0e 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
Name: cinnamon
Version: 1.9.2
-Release: 0.3.git%{_internal_version}%{?dist}
+Release: 0.4.git%{_internal_version}%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -23,8 +23,9 @@ Patch4: screensaver.patch
Patch5: fix_default_theme.patch
Patch6: replace_gksu.patch
Patch7: use_fedora_firewall.patch
-Patch8: keyboard_applet.patch
-Patch9: idle-dim.patch
+Patch8: automake_14.patch
+Patch9: keyboard_applet.patch
+Patch10: idle-dim.patch
%global clutter_version 1.12.2
%global gobject_introspection_version 1.34.2
@@ -136,8 +137,9 @@ The emphasis is put on making users feel at home and providing
%patch5 -p1
%patch6 -p1
%patch7 -p1
-#patch8 -p1
+%patch8 -p1
#patch9 -p1
+#patch10 -p1
NOCONFIGURE=1 ./autogen.sh
%build
@@ -206,6 +208,9 @@ fi
%{_mandir}/man1/*
%changelog
+* Thu Jul 25 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.4.git435e7a2
+- Fix automake warnings
+
* Thu Jul 25 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.2-0.3.git435e7a2
- update to latest git
- fix default theme
More information about the scm-commits
mailing list