- comply to various packaging rules

diff --git a/configure.in b/configure.in
index 4f345548b2b240bf7e1cf874a22dcef46dcee6f0..66a43bd8c0189913fc0677633f979c41013e824e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,12 +23,10 @@ CXXFLAGS="${CXXFLAGS} -std=c++0x -DHAVE_CXX0X -Wall -Wextra -Wformat=2 -Wnon-vir
 
 docdir=\${prefix}/share/doc/packages/snapper
 fillupdir=/var/adm/fillup-templates
-logrotatedir=/etc/logrotate.d
 
 AC_SUBST(VERSION)
 AC_SUBST(docdir)
 AC_SUBST(fillupdir)
-AC_SUBST(logrotatedir)
 
 AC_OUTPUT(
        Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
index ce7000e83445df64c9d032fd6515064de730a512..afe71b6ed79f179cdce3e6b14b7031fd201788a3 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,10 +4,9 @@
 
 fillup_DATA = sysconfig.snapper
 
-logrotate_DATA = snapper
-
-EXTRA_DIST = $(fillup_DATA) $(logrotate_DATA)
+EXTRA_DIST = $(fillup_DATA) snapper.logrotate
 
 install-data-local:
-       mkdir -p $(DESTDIR)/etc/sysconfig/snapper.d
+       install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper
+       install -d -m 755 $(DESTDIR)/etc/snapper/configs
 

diff --git a/data/snapper b/data/snapper.logrotate
similarity index 100%
rename from data/snapper
rename to data/snapper.logrotate

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ac1479c82b232a4652be7e55f2ccfe5764103741..38d9c9a057fbebd81a66699c6279de38cd474523 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,15 +2,9 @@
 # Makefile.am for snapper/scripts
 #
 
-hourlydir = /etc/cron.hourly
+EXTRA_DIST = snapper-hourly snapper-daily
 
-hourly_SCRIPTS = snapper-hourly
-
-
-dailydir = /etc/cron.daily
-
-daily_SCRIPTS = snapper-daily
-
-
-EXTRA_DIST = $(hourly_SCRIPTS) $(daily_SCRIPTS)
+install-data-local:
+       install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper
+       install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper
 

diff --git a/scripts/snapper-daily b/scripts/snapper-daily
index 64f4a9e227476430846e1506c4da8fcdb61c9424..b6d1976ab197b58200b00c3eb0443541f3f0f0f1 100755 (executable)
--- a/scripts/snapper-daily
+++ b/scripts/snapper-daily
@@ -24,7 +24,7 @@ for CONFIG in $SNAPPER_CONFIGS ; do
     NUMBER_CLEANUP="no"
     TIMELINE_CLEANUP="no"
 
-    . /etc/sysconfig/snapper.d/$CONFIG
+    . /etc/snapper/configs/$CONFIG
 
     if [ "$NUMBER_CLEANUP" = "yes" ] ; then
        snapper --config=$CONFIG cleanup number

diff --git a/scripts/snapper-hourly b/scripts/snapper-hourly
index da1bb7374ef21a1636bd60dcb75d51960b8ad279..46cd781de0dbff41b90abca5de92f8823cb13a4a 100755 (executable)
--- a/scripts/snapper-hourly
+++ b/scripts/snapper-hourly
@@ -23,7 +23,7 @@ for CONFIG in $SNAPPER_CONFIGS ; do
 
     TIMELINE_CREATE="no"
 
-    . /etc/sysconfig/snapper.d/$CONFIG
+    . /etc/snapper/configs/$CONFIG
 
     if [ "$TIMELINE_CREATE" = "yes" ] ; then
        snapper --config=$CONFIG create --description="timeline" --cleanup="timeline"

diff --git a/snapper.spec.in b/snapper.spec.in
index eb9bc84548c58aa58fe3aa903ef12855db67c823..8da089e2fc27bcfa17ff052a8a8cd5184c863769 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -14,7 +14,7 @@ Source1:      snapper-rpmlintrc
 Prefix:                /usr
 BuildRequires: gcc-c++ boost-devel blocxx-devel doxygen dejagnu libxml2-devel
 Requires:      libsnapper = %version
-Recommends:    cron
+Recommends:    cron logrotate
 Summary:       Tool for filesystem snapshot management
 
 %description
@@ -50,14 +50,14 @@ rm -rf "$RPM_BUILD_ROOT"
 %files
 %defattr(-,root,root)
 %{prefix}/bin/snapper
-/etc/cron.hourly/snapper-hourly
-/etc/cron.daily/snapper-daily
+%config(noreplace) %{_sysconfdir}/logrotate.d/snapper
+/etc/cron.hourly/suse.de-snapper
+/etc/cron.daily/suse.de-snapper
 
 %package -n libsnapper
 Summary:       Library for filesystem snapshot management
 Group:         System/Libraries
 Requires:      btrfsprogs diffutils
-Recommends:    logrotate
 PreReq:                %fillup_prereq
 
 %description -n libsnapper
@@ -70,8 +70,8 @@ Authors:
 %files -n libsnapper
 %defattr(-,root,root)
 %{_libdir}/libsnapper.so.*
-%dir %{_sysconfdir}/sysconfig/snapper.d
-%config(noreplace) %{_sysconfdir}/logrotate.d/snapper
+%dir %{_sysconfdir}/snapper
+%dir %{_sysconfdir}/snapper/configs
 %doc %dir %{prefix}/share/doc/packages/snapper
 %doc %{prefix}/share/doc/packages/snapper/AUTHORS
 %doc %{prefix}/share/doc/packages/snapper/COPYING

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index a0becc55c03766ffdb279605538937c9abcc65af..570c07e503916c4c31ba401fa83776e7b75415e6 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -50,7 +50,7 @@ namespace snapper
        y2mil("libsnapper version " VERSION);
        y2mil("config_name:" << config_name);
 
-       config = new SysconfigFile((CONFIGDIR "/" + config_name).c_str());
+       config = new SysconfigFile((CONFIGSDIR "/" + config_name).c_str());
 
        string val;
        if (config->getValue("SUBVOLUME", val))

diff --git a/snapper/SnapperDefines.h b/snapper/SnapperDefines.h
index 611034b5d1d762339e44301e45b8026ef17fae35..ca3847629d718ab29b6d522b422d047198aa0dc0 100644 (file)
--- a/snapper/SnapperDefines.h
+++ b/snapper/SnapperDefines.h
@@ -24,7 +24,7 @@
 #define SNAPPER_DEFINES_H
 
 
-#define CONFIGDIR "/etc/sysconfig/snapper.d"
+#define CONFIGSDIR "/etc/snapper/configs"
 
 #define SNAPSHOTDIR "/snapshot"
 #define SNAPSHOTSDIR "/snapshots"