commit 262c3572057f879b6297e71556e17d2c5b089b01 Author: Marcin Banasiak <marcin.banas...@gmail.com> Date: Mon Sep 28 19:40:02 2015 +0200
Update to 3.18.0 - removed obsolete -docdir and -omf patches gnome-common-docdir.patch | 64 ----------------------------------------------- gnome-common-omf.patch | 18 ------------- gnome-common.spec | 16 ++++-------- 3 files changed, 5 insertions(+), 93 deletions(-) --- diff --git a/gnome-common.spec b/gnome-common.spec index c36c34a..63ee74d 100644 --- a/gnome-common.spec +++ b/gnome-common.spec @@ -2,15 +2,13 @@ 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.14.0 -Release: 3 +Version: 3.18.0 +Release: 1 License: GPL v2+ Group: Development/Tools -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/3.14/%{name}-%{version}.tar.xz -# Source0-md5: ba58c61d0d81b7c3ff8452c620513a9d -Patch0: %{name}-omf.patch -Patch1: %{name}-docdir.patch -Patch2: disable-too-pedantic-Werror.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/3.18/%{name}-%{version}.tar.xz +# Source0-md5: 933258d9c23e218eb6eec9cc1951b053 +Patch0: disable-too-pedantic-Werror.patch URL: http://www.gnome.org/ BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1:1.9 @@ -36,8 +34,6 @@ Ten pakiet dostarcza makra do budowania pakietów GNOME. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %{__aclocal} @@ -63,8 +59,6 @@ rm -rf $RPM_BUILD_ROOT %files %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 diff --git a/gnome-common-docdir.patch b/gnome-common-docdir.patch deleted file mode 100644 index 803777a..0000000 --- a/gnome-common-docdir.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- gnome-common-2.12.0/doc-build/xmldocs.make.orig 2005-01-03 06:43:23.000000000 +0100 -+++ gnome-common-2.12.0/doc-build/xmldocs.make 2006-08-09 19:13:17.384774000 +0200 -@@ -34,9 +34,9 @@ - - - # ********** Begin of section some packagers may need to modify ********** --# This variable (docdir) specifies where the documents should be installed. -+# This variable (gtkdochelpdir) specifies where the documents should be installed. - # This default value should work for most packages. --docdir = $(datadir)/gnome/help/$(docname)/$(lang) -+gtkdochelpdir = $(datadir)/gnome/help/$(docname)/$(lang) - - # ********** You should not have to edit below this line ********** - xml_files = $(entities) $(docname).xml -@@ -63,15 +63,15 @@ - fi - - install-data-local: omf -- $(mkinstalldirs) $(DESTDIR)$(docdir) -+ $(mkinstalldirs) $(DESTDIR)$(gtkdochelpdir) - for file in $(xml_files); do \ -- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ -+ cp $(srcdir)/$$file $(DESTDIR)$(gtkdochelpdir); \ - done - if test "$(figdir)"; then \ -- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ -+ $(mkinstalldirs) $(DESTDIR)$(gtkdochelpdir)/$(figdir); \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(gtkdochelpdir)/$(figdir)/$$basefile; \ - done \ - fi - -@@ -83,14 +83,14 @@ - -if test "$(figdir)"; then \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ -- rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ -+ rm -f $(DESTDIR)$(gtkdochelpdir)/$(figdir)/$$basefile; \ - done; \ -- rmdir $(DESTDIR)$(docdir)/$(figdir); \ -+ rmdir $(DESTDIR)$(gtkdochelpdir)/$(figdir); \ - fi - -for file in $(xml_files); do \ -- rm -f $(DESTDIR)$(docdir)/$$file; \ -+ rm -f $(DESTDIR)$(gtkdochelpdir)/$$file; \ - done -- -rmdir $(DESTDIR)$(docdir) -+ -rmdir $(DESTDIR)$(gtkdochelpdir) - - clean-local: clean-local-doc clean-local-omf - ---- 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 \ - 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 deleted file mode 100644 index 655a49a..0000000 --- a/gnome-common-omf.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 $(omffile); do \ -@@ -57,7 +56,6 @@ uninstall-local-omf: - rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ - done - -rmdir $(DESTDIR)$(omf_dest_dir) -- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) - - clean-local-omf: - -for file in $(omffile); do \ ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/gnome-common.git/commitdiff/262c3572057f879b6297e71556e17d2c5b089b01 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit