Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	rancid.spec
@@ -6,6 +6,7 @@ Summary: Really Awesome New Cisco confIg Differ URL: http://www.shrubbery.net/rancid/ Source0: %{name}-%{version}.tar.gz +Patch0: %{name}-etc-makefile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Packager: Carsten Schoene <cs@linux-administrator.com> Vendor: linux-administrator.com @@ -25,6 +26,7 @@ %prep %setup +%patch %configure %build
[-] [+]	Added	rancid-etc-makefile.diff ^
@@ -0,0 +1,68 @@ +--- etc/Makefile.in.orig 2008-02-20 22:44:22.000000000 +0100 ++++ etc/Makefile.in 2008-02-20 22:45:50.000000000 +0100 +@@ -348,23 +348,23 @@ + + install-data-local: all + @if test "$(DO_CONF_INSTALL)" = "yes"; then \ +- if test -f $(sysconfdir)/rancid.conf ; then \ ++ if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \ + echo ""; \ +- echo "WARNING: * $(sysconfdir)/rancid.conf exists. See "; \ +- echo " * $(pkgdatadir)/rancid.conf.sample for new"; \ ++ echo "WARNING: * $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \ ++ echo " * $(DESTDIR)$(pkgdatadir)/rancid.conf.sample for new"; \ + echo " * examples."; \ + echo ""; \ + else \ +- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \ ++ $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \ + fi; \ +- if test -f $(sysconfdir)/lg.conf ; then \ ++ if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \ + echo ""; \ +- echo "WARNING: * $(sysconfdir)/lg.conf exists. See "; \ +- echo " * $(pkgdatadir)/lg.conf.sample for new"; \ ++ echo "WARNING: * $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \ ++ echo " * $(DESTDIR)$(pkgdatadir)/lg.conf.sample for new"; \ + echo " * examples."; \ + echo ""; \ + else \ +- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \ ++ $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ + fi; \ + fi + +--- etc/Makefile.am.orig 2008-02-20 22:44:17.000000000 +0100 ++++ etc/Makefile.am 2008-02-20 22:45:03.000000000 +0100 +@@ -34,23 +34,23 @@ + + install-data-local: all + @if test "$(DO_CONF_INSTALL)" = "yes"; then \ +- if test -f $(sysconfdir)/rancid.conf ; then \ ++ if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \ + echo ""; \ +- echo "WARNING: * $(sysconfdir)/rancid.conf exists. See "; \ +- echo " * $(pkgdatadir)/rancid.conf.sample for new"; \ ++ echo "WARNING: * $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \ ++ echo " * $(DESTDIR)$(pkgdatadir)/rancid.conf.sample for new"; \ + echo " * examples."; \ + echo ""; \ + else \ +- $(INSTALL_DATA) rancid.conf.sample $(sysconfdir)/rancid.conf; \ ++ $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \ + fi; \ +- if test -f $(sysconfdir)/lg.conf ; then \ ++ if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \ + echo ""; \ +- echo "WARNING: * $(sysconfdir)/lg.conf exists. See "; \ +- echo " * $(pkgdatadir)/lg.conf.sample for new"; \ ++ echo "WARNING: * $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \ ++ echo " * $(DESTDIR)$(pkgdatadir)/lg.conf.sample for new"; \ + echo " * examples."; \ + echo ""; \ + else \ +- $(INSTALL_DATA) lg.conf.sample $(sysconfdir)/lg.conf; \ ++ $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ + fi; \ + fi +