pghmcfc pushed to geoipupdate (f21). "Split patch into upstream and downstream parts"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 21:08:56 UTC 2015
>From a87dbcfd81dc7d16b7cbbfa9e370023c8bd4c550 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Mon, 13 Apr 2015 21:46:55 +0100
Subject: Split patch into upstream and downstream parts
diff --git a/geoipupdate-2.2.1-autotools.patch b/geoipupdate-2.2.1-autotools.patch
new file mode 100644
index 0000000..abbf75b
--- /dev/null
+++ b/geoipupdate-2.2.1-autotools.patch
@@ -0,0 +1,320 @@
+--- aclocal.m4
++++ aclocal.m4
+@@ -1,4 +1,5 @@
+ # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
++# and touched to get build order right
+
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+--- configure
++++ configure
+@@ -11796,6 +11796,7 @@ CC="$lt_save_CC"
+
+
+
++
+ ac_fn_c_check_type "$LINENO" "byte" "ac_cv_type_byte" "$ac_includes_default"
+ if test "x$ac_cv_type_byte" = xyes; then :
+ $as_echo "#define HAVE_BYTE_TYPEDEF 1" >>confdefs.h
+--- conf/Makefile.in
++++ conf/Makefile.in
+@@ -13,7 +13,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-
+ VPATH = @srcdir@
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+@@ -79,8 +78,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ subdir = conf
+-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+- $(dist_sysconf_DATA)
++DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -107,35 +105,6 @@ am__can_run_installinfo = \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+-am__install_max = 40
+-am__nobase_strip_setup = \
+- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+-am__nobase_strip = \
+- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+-am__nobase_list = $(am__nobase_strip_setup); \
+- for p in $$list; do echo "$$p $$p"; done | \
+- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+- if (++n[$$2] == $(am__install_max)) \
+- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+- END { for (dir in files) print dir, files[dir] }'
+-am__base_list = \
+- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__uninstall_files_from_dir = { \
+- test -z "$$files" \
+- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+- $(am__cd) "$$dir" && rm -f $$files; }; \
+- }
+-am__installdirs = "$(DESTDIR)$(sysconfdir)"
+-DATA = $(dist_sysconf_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+@@ -253,7 +222,6 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-dist_sysconf_DATA = GeoIP.conf.default
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
+ all: all-am
+
+@@ -294,27 +262,6 @@ mostlyclean-libtool:
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-dist_sysconfDATA: $(dist_sysconf_DATA)
+- @$(NORMAL_INSTALL)
+- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+- if test -n "$$list"; then \
+- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
+- fi; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
+- done
+-
+-uninstall-dist_sysconfDATA:
+- @$(NORMAL_UNINSTALL)
+- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
+ tags TAGS:
+
+ ctags CTAGS:
+@@ -354,11 +301,8 @@ distdir: $(DISTFILES)
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(DATA)
++all-am: Makefile
+ installdirs:
+- for dir in "$(DESTDIR)$(sysconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+- done
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -415,7 +359,7 @@ install-dvi: install-dvi-am
+
+ install-dvi-am:
+
+-install-exec-am: install-dist_sysconfDATA
++install-exec-am:
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-am
+@@ -454,7 +398,7 @@ ps: ps-am
+
+ ps-am:
+
+-uninstall-am: uninstall-dist_sysconfDATA
++uninstall-am:
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+ .MAKE: install-am install-exec-am install-strip uninstall-am
+@@ -462,19 +406,21 @@ uninstall-am: uninstall-dist_sysconfDATA
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ cscopelist-am ctags-am distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-dist_sysconfDATA install-dvi install-dvi-am \
+- install-exec install-exec-am install-exec-hook install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags-am uninstall uninstall-am uninstall-dist_sysconfDATA \
+- uninstall-hook
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-exec-hook \
++ install-html install-html-am install-info install-info-am \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++ ps ps-am tags-am uninstall uninstall-am uninstall-hook
+
+
+ install-exec-hook:
++ @if test ! -d "$(DESTDIR)$(sysconfdir)" ; then \
++ echo "$(MKDIR_P) $(DESTDIR)$(sysconfdir)" ; \
++ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ; \
++ fi
+ @if test -f "$(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; then \
+ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+ else \
+--- Makefile.in
++++ Makefile.in
+@@ -13,6 +13,7 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++
+ VPATH = @srcdir@
+ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+ am__make_running_with_option = \
+@@ -80,7 +81,7 @@ host_triplet = @host@
+ subdir = .
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) compile \
+- config.guess config.sub install-sh missing ltmain.sh
++ config.guess config.sub depcomp install-sh missing ltmain.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+@@ -117,6 +118,35 @@ am__can_run_installinfo = \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
++am__installdirs = "$(DESTDIR)$(docdir)"
++DATA = $(doc_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ am__recursive_targets = \
+@@ -311,6 +341,7 @@ SUBDIRS = \
+ man
+
+ EXTRA_DIST = ChangeLog.md LICENSE README.md bootstrap
++doc_DATA = ChangeLog.md README.md conf/GeoIP.conf.default
+ all: all-recursive
+
+ .SUFFIXES:
+@@ -357,6 +388,27 @@ clean-libtool:
+
+ distclean-libtool:
+ -rm -f libtool config.lt
++install-docDATA: $(doc_DATA)
++ @$(NORMAL_INSTALL)
++ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
++ done
++
++uninstall-docDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run 'make' without going through this Makefile.
+@@ -654,9 +706,12 @@ distcleancheck: distclean
+ exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile
++all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
++ for dir in "$(DESTDIR)$(docdir)"; do \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -709,7 +764,7 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am:
++install-data-am: install-docDATA
+
+ install-dvi: install-dvi-recursive
+
+@@ -755,7 +810,7 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-docDATA
+
+ .MAKE: $(am__recursive_targets) install-am install-strip
+
+@@ -766,14 +821,15 @@ uninstall-am:
+ dist-xz dist-zip distcheck distclean distclean-generic \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am tags tags-am uninstall uninstall-am
++ install install-am install-data install-data-am \
++ install-docDATA install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
++ uninstall-am uninstall-docDATA
+
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/geoipupdate-2.2.1-docdir.patch b/geoipupdate-2.2.1-docdir.patch
index a4359e0..7f3d6a8 100644
--- a/geoipupdate-2.2.1-docdir.patch
+++ b/geoipupdate-2.2.1-docdir.patch
@@ -31,323 +31,3 @@
EXTRA_DIST = ChangeLog.md LICENSE README.md bootstrap
+
+doc_DATA = ChangeLog.md README.md conf/GeoIP.conf.default
---- aclocal.m4
-+++ aclocal.m4
-@@ -1,4 +1,5 @@
- # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
-+# and touched to get build order right
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
---- configure
-+++ configure
-@@ -11796,6 +11796,7 @@ CC="$lt_save_CC"
-
-
-
-+
- ac_fn_c_check_type "$LINENO" "byte" "ac_cv_type_byte" "$ac_includes_default"
- if test "x$ac_cv_type_byte" = xyes; then :
- $as_echo "#define HAVE_BYTE_TYPEDEF 1" >>confdefs.h
---- conf/Makefile.in
-+++ conf/Makefile.in
-@@ -13,7 +13,6 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
--
- VPATH = @srcdir@
- am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
- am__make_running_with_option = \
-@@ -79,8 +78,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- subdir = conf
--DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-- $(dist_sysconf_DATA)
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -107,35 +105,6 @@ am__can_run_installinfo = \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
-- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-- *) f=$$p;; \
-- esac;
--am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
--am__install_max = 40
--am__nobase_strip_setup = \
-- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
--am__nobase_strip = \
-- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
--am__nobase_list = $(am__nobase_strip_setup); \
-- for p in $$list; do echo "$$p $$p"; done | \
-- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-- if (++n[$$2] == $(am__install_max)) \
-- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-- END { for (dir in files) print dir, files[dir] }'
--am__base_list = \
-- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
--am__uninstall_files_from_dir = { \
-- test -z "$$files" \
-- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-- $(am__cd) "$$dir" && rm -f $$files; }; \
-- }
--am__installdirs = "$(DESTDIR)$(sysconfdir)"
--DATA = $(dist_sysconf_DATA)
- am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-@@ -253,7 +222,6 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--dist_sysconf_DATA = GeoIP.conf.default
- DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
- all: all-am
-
-@@ -294,27 +262,6 @@ mostlyclean-libtool:
-
- clean-libtool:
- -rm -rf .libs _libs
--install-dist_sysconfDATA: $(dist_sysconf_DATA)
-- @$(NORMAL_INSTALL)
-- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-- if test -n "$$list"; then \
-- echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
-- $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
-- fi; \
-- for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- echo "$$d$$p"; \
-- done | $(am__base_list) | \
-- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-- done
--
--uninstall-dist_sysconfDATA:
-- @$(NORMAL_UNINSTALL)
-- @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-- dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
- tags TAGS:
-
- ctags CTAGS:
-@@ -354,11 +301,8 @@ distdir: $(DISTFILES)
- done
- check-am: all-am
- check: check-am
--all-am: Makefile $(DATA)
-+all-am: Makefile
- installdirs:
-- for dir in "$(DESTDIR)$(sysconfdir)"; do \
-- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-- done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -415,7 +359,7 @@ install-dvi: install-dvi-am
-
- install-dvi-am:
-
--install-exec-am: install-dist_sysconfDATA
-+install-exec-am:
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- install-html: install-html-am
-@@ -454,7 +398,7 @@ ps: ps-am
-
- ps-am:
-
--uninstall-am: uninstall-dist_sysconfDATA
-+uninstall-am:
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
- .MAKE: install-am install-exec-am install-strip uninstall-am
-@@ -462,19 +406,21 @@ uninstall-am: uninstall-dist_sysconfDATA
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- cscopelist-am ctags-am distclean distclean-generic \
- distclean-libtool distdir dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am \
-- install-dist_sysconfDATA install-dvi install-dvi-am \
-- install-exec install-exec-am install-exec-hook install-html \
-- install-html-am install-info install-info-am install-man \
-- install-pdf install-pdf-am install-ps install-ps-am \
-- install-strip installcheck installcheck-am installdirs \
-- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags-am uninstall uninstall-am uninstall-dist_sysconfDATA \
-- uninstall-hook
-+ install install-am install-data install-data-am install-dvi \
-+ install-dvi-am install-exec install-exec-am install-exec-hook \
-+ install-html install-html-am install-info install-info-am \
-+ install-man install-pdf install-pdf-am install-ps \
-+ install-ps-am install-strip installcheck installcheck-am \
-+ installdirs maintainer-clean maintainer-clean-generic \
-+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+ ps ps-am tags-am uninstall uninstall-am uninstall-hook
-
-
- install-exec-hook:
-+ @if test ! -d "$(DESTDIR)$(sysconfdir)" ; then \
-+ echo "$(MKDIR_P) $(DESTDIR)$(sysconfdir)" ; \
-+ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ; \
-+ fi
- @if test -f "$(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; then \
- echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
- else \
---- Makefile.in
-+++ Makefile.in
-@@ -13,6 +13,7 @@
- # PARTICULAR PURPOSE.
-
- @SET_MAKE@
-+
- VPATH = @srcdir@
- am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
- am__make_running_with_option = \
-@@ -80,7 +81,7 @@ host_triplet = @host@
- subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) compile \
-- config.guess config.sub install-sh missing ltmain.sh
-+ config.guess config.sub depcomp install-sh missing ltmain.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -117,6 +118,35 @@ am__can_run_installinfo = \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__uninstall_files_from_dir = { \
-+ test -z "$$files" \
-+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-+ $(am__cd) "$$dir" && rm -f $$files; }; \
-+ }
-+am__installdirs = "$(DESTDIR)$(docdir)"
-+DATA = $(doc_DATA)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
- am__recursive_targets = \
-@@ -311,6 +341,7 @@ SUBDIRS = \
- man
-
- EXTRA_DIST = ChangeLog.md LICENSE README.md bootstrap
-+doc_DATA = ChangeLog.md README.md conf/GeoIP.conf.default
- all: all-recursive
-
- .SUFFIXES:
-@@ -357,6 +388,27 @@ clean-libtool:
-
- distclean-libtool:
- -rm -f libtool config.lt
-+install-docDATA: $(doc_DATA)
-+ @$(NORMAL_INSTALL)
-+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-+ if test -n "$$list"; then \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-+ fi; \
-+ for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-+ done
-+
-+uninstall-docDATA:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run 'make' without going through this Makefile.
-@@ -654,9 +706,12 @@ distcleancheck: distclean
- exit 1; } >&2
- check-am: all-am
- check: check-recursive
--all-am: Makefile
-+all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-+ for dir in "$(DESTDIR)$(docdir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -709,7 +764,7 @@ info: info-recursive
-
- info-am:
-
--install-data-am:
-+install-data-am: install-docDATA
-
- install-dvi: install-dvi-recursive
-
-@@ -755,7 +810,7 @@ ps: ps-recursive
-
- ps-am:
-
--uninstall-am:
-+uninstall-am: uninstall-docDATA
-
- .MAKE: $(am__recursive_targets) install-am install-strip
-
-@@ -766,14 +821,15 @@ uninstall-am:
- dist-xz dist-zip distcheck distclean distclean-generic \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-dvi \
-- install-dvi-am install-exec install-exec-am install-html \
-- install-html-am install-info install-info-am install-man \
-- install-pdf install-pdf-am install-ps install-ps-am \
-- install-strip installcheck installcheck-am installdirs \
-- installdirs-am maintainer-clean maintainer-clean-generic \
-- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-- ps ps-am tags tags-am uninstall uninstall-am
-+ install install-am install-data install-data-am \
-+ install-docDATA install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
-+ installcheck-am installdirs installdirs-am maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-+ uninstall-am uninstall-docDATA
-
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/geoipupdate.spec b/geoipupdate.spec
index cace5e0..da874fe 100644
--- a/geoipupdate.spec
+++ b/geoipupdate.spec
@@ -5,7 +5,7 @@
Name: geoipupdate
Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Update GeoIP2 and GeoIP Legacy binary databases from MaxMind
Group: Development/Tools
License: GPLv2
@@ -14,6 +14,7 @@ Source0: http://github.com/maxmind/geoipupdate/releases/download/v%{version}/geo
Source1: geoipupdate.cron
Source2: geoipupdate6.cron
Patch0: geoipupdate-2.2.1-docdir.patch
+Patch1: geoipupdate-2.2.1-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: curl-devel
BuildRequires: zlib-devel
@@ -64,6 +65,9 @@ Cron job for weekly updates to GeoIP IPv6 Legacy database from MaxMind.
# https://github.com/maxmind/geoipupdate/issues/26
%patch0
+# Changes to autotools-generated files as a result of previous patch
+%patch1
+
%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}
@@ -118,6 +122,10 @@ rm -rf %{buildroot}
%ghost %{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz
%changelog
+* Mon Apr 13 2015 Paul Howarth <paul at city-fan.org> - 2.2.1-2
+- Split patch for upstream issue #26 into separate patches for upstream changes
+ and effect of running autotools
+
* Wed Mar 4 2015 Philip A. Prindeville <philipp at fedoraproject.org> - 2.2.1-1
- Update to 2.2.1
- geoipupdate now verifies the MD5 of the new database before deploying it;
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/geoipupdate.git/commit/?h=f21&id=a87dbcfd81dc7d16b7cbbfa9e370023c8bd4c550
More information about the scm-commits
mailing list