diff --git a/amanda-2.6.1p2-example.patch b/amanda-2.6.1p2-example.patch index 788712b..e07e5c0 100644 --- a/amanda-2.6.1p2-example.patch +++ b/amanda-2.6.1p2-example.patch @@ -1,14 +1,12 @@ diff -up amanda-2.6.1p2/example/Makefile.am.example amanda-2.6.1p2/example/Makefile.am --- amanda-2.6.1p2/example/Makefile.am.example 2008-12-22 19:13:55.000000000 +0100 +++ amanda-2.6.1p2/example/Makefile.am 2010-01-20 13:47:02.000000000 +0100 -@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va - include $(top_srcdir)/config/automake/installperms.am +@@ -4,8 +4,8 @@ include $(top_srcdir)/config/automake/va amanda_dir = $(amdatadir) --templatedir = $(amanda_dir)/template.d + templatedir = $(amanda_dir)/template.d -exampledir = $(amanda_dir)/example -lbltempldir = $(amanda_dir)/example/label-templates -+templatedir = $(localstatedir)/lib/amanda/template.d +exampledir = $(sysconfdir)/amanda/example +lbltempldir = $(sysconfdir)/amanda/example/label-templates diff --git a/amanda.spec b/amanda.spec index a09a0af..1fece6b 100644 --- a/amanda.spec +++ b/amanda.spec @@ -106,6 +106,7 @@ export MAILER=/bin/mail --disable-static \ --disable-dependency-tracking \ --disable-installperms \ + --with-amdatadir=%{_localstatedir}/lib/amanda \ --with-amlibdir=%{_libdir} \ --with-amperldir=%{perl_vendorarch} \ --with-index-server=%{indexserver} \ @@ -408,6 +409,9 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf | %{_libdir}/libamxfer.so %changelog +* Tue Aug 03 2010 Jan Görig - 2.6.1p2-4 +- fix #600552 - corrected amdatadir path, updated example patch + * Thu Apr 22 2010 Daniel Novotny 2.6.1p2-3 - fix #584774 - PIE patch disabled in amanda 2.6.1p2-2