Updated to 3.5.91

diff --git a/gnome-common-docdir.patch b/gnome-common-docdir.patch
index 7beb88b4a6b7616c515298314547dfb38a52bd9d..f57657cbe999df5f2c451ea4d3e3bf6aabf778ac 100644 (file)
--- a/gnome-common-docdir.patch
+++ b/gnome-common-docdir.patch
@@ -51,14 +51,14 @@
  
  clean-local: clean-local-doc clean-local-omf
  
---- gnome-common-2.12.0/doc-build/omf.make.orig        2006-08-09 19:07:44.823990000 +0200
-+++ gnome-common-2.12.0/doc-build/omf.make     2006-08-09 19:13:24.953247000 +0200
-@@ -36,7 +36,7 @@
- 
- omf_timestamp: $(omffile)
+--- gnome-common-3.5.91/doc-build/omf.make.orig        2012-09-26 19:39:18.511208144 +0200
++++ gnome-common-3.5.91/doc-build/omf.make     2012-09-26 19:42:35.930138821 +0200
+@@ -38,7 +38,7 @@ omf_timestamp: $(omffile)
        -for file in $(omffile); do \
--        scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-+        scrollkeeper-preinstall $(gtkdochelpdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
+         absfile=$(srcdir)/$$file \
+         test -r $$file && absfile=$$file \
+-        scrollkeeper-preinstall $(docdir)/$(docname).xml $$absfile $$file.out; \
++        scrollkeeper-preinstall $(gtkdochelpdir)/$(docname).xml $$absfile $$file.out; \
        done; \
        touch omf_timestamp
  

diff --git a/gnome-common-omf.patch b/gnome-common-omf.patch
index 2e156df70363fafe0d437156982b51961b21b2e8..655a49ab0cae9c9bf85f57d191a78796d6869ba5 100644 (file)
--- a/gnome-common-omf.patch
+++ b/gnome-common-omf.patch
@@ -1,15 +1,14 @@
-diff -aurN gnome-common-2.8.0.orig/doc-build/omf.make gnome-common-2.8.0/doc-build/omf.make
---- gnome-common-2.8.0.orig/doc-build/omf.make 2003-05-24 17:16:25.000000000 +0200
-+++ gnome-common-2.8.0/doc-build/omf.make      2004-12-06 19:09:24.392849504 +0100
-@@ -45,7 +45,6 @@
-       for file in $(omffile); do \
-               $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+--- gnome-common-3.5.91/doc-build/omf.make.old 2012-09-26 19:38:30.541466837 +0200
++++ gnome-common-3.5.91/doc-build/omf.make     2012-09-26 19:38:38.438091893 +0200
+@@ -49,7 +49,6 @@ install-data-hook-omf:
+               test -r $$file.out && absfile=$$file.out; \
+               $(INSTALL_DATA) $$absfile $(DESTDIR)$(omf_dest_dir)/$$file; \
        done
 -      -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
  
  uninstall-local-omf:
-       -for file in $(srcdir)/*.omf; do \
-@@ -53,7 +52,6 @@
+       -for file in $(omffile); do \
+@@ -57,7 +56,6 @@ uninstall-local-omf:
                rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
        done
        -rmdir $(DESTDIR)$(omf_dest_dir)

diff --git a/gnome-common.spec b/gnome-common.spec
index ba33206bded9324d7d8d8012c39fded3c3c68eb4..4836c38a5481e8dfd9660f1b9ca51a1b190c75a7 100644 (file)
--- a/gnome-common.spec
+++ b/gnome-common.spec
@@ -2,12 +2,12 @@ Summary:      Common macros useful for building GNOME packages
 Summary(es.UTF-8):     Macros comunes útiles para construir paquetes de GNOME
 Summary(pl.UTF-8):     Wspólne makra przydatne do budowania pakietów GNOME
 Name:          gnome-common
-Version:       3.4.0.1
+Version:       3.5.91
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-common/3.4/%{name}-%{version}.tar.xz
-# Source0-md5: 18480be01c632577002462054062c42b
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-common/3.5/%{name}-%{version}.tar.xz
+# Source0-md5: 6e972380f28e6a2623af415b894a6fa3
 Patch0:                %{name}-omf.patch
 Patch1:                %{name}-docdir.patch
 URL:           http://www.gnome.org/
@@ -56,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gnome-autogen.sh
 %attr(755,root,root) %{_bindir}/gnome-doc-common
+%{_aclocaldir}/gnome-code-coverage.m4
 %{_aclocaldir}/gnome-common.m4
 %{_aclocaldir}/gnome-compiler-flags.m4
 %{_datadir}/gnome-common