- work on packaging

diff --git a/client/Makefile.am b/client/Makefile.am
index 7c049593f65774d707541c6979dd977fdc7ebfbb..8341a6f97d091305dbb6fdf7d77add0392312792 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -7,6 +7,10 @@ INCLUDES = -I$(top_srcdir) -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
 
 bin_PROGRAMS = snapper
 
-snapper_SOURCES = snapper.cc types.cc commands.cc
+snapper_SOURCES =                      \
+       snapper.cc                      \
+       types.cc        types.h         \
+       commands.cc     commands.h
+
 snapper_LDADD = ../snapper/libsnapper.la ../tools/utils/libutils.la ../dbus/libdbus.la -ldbus-1
 

diff --git a/data/Makefile.am b/data/Makefile.am
index 53281f38370706c89114713a017e1d8987c93f13..4074c8c8f73a85c1520bbf19324375715ac4e1a9 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,5 +12,5 @@ install-data-local:
        install -d -m 755 $(DESTDIR)/etc/snapper/filters
        install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt
        install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt
-       install -D -m 644 org.opensuse.snapper.conf /etc/dbus-1/system.d/org.opensuse.snapper.conf
-       install -D -m 644 org.opensuse.snapper.service /usr/share/dbus-1/system-services/org.opensuse.snapper.service
+       install -D -m 644 org.opensuse.snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.snapper.conf
+       install -D -m 644 org.opensuse.snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.snapper.service

diff --git a/doc/.gitignore b/doc/.gitignore
index 9355a9b884f7d68a7787f50e1e707c3e08b533f5..e299af10a64e4e1701db41e24b6ef95a350508fa 100644 (file)
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
 snapper.8
+snapperd.8

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a78c56f2b712d6cb1fa07388650ce90a554926f8..87f2720710f06dbfe29b01273c2b9272994a41ab 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@
 # Makefile.am for snapper/doc
 #
 
-man_MANS = snapper.8
+man_MANS = snapper.8 snapperd.8
 
 EXTRA_DIST = $(man_MANS)
 

diff --git a/doc/snapperd.8.in b/doc/snapperd.8.in
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/server/Makefile.am b/server/Makefile.am
index 4f39cf855d1d86bd84625c24756c5c9d134983d1..a59a2be6ee3834e4e3918a2811af1cf1ad1eda51 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -2,11 +2,17 @@
 # Makefile.am for snapper/tools/server
 #
 
-INCLUDES = -I$(top_srcdir)  -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
+INCLUDES = -I$(top_srcdir) -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
 
 
 sbin_PROGRAMS = snapperd
 
-snapperd_SOURCES = snapperd.cc Client.cc Job.cc MetaSnapper.cc Types.cc
+snapperd_SOURCES =                                     \
+       snapperd.cc                                     \
+       Client.cc               Client.h                \
+       Job.cc                  Job.h                   \
+       MetaSnapper.cc          MetaSnapper.h           \
+       Types.cc                Types.h
+
 snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -ldbus-1 -lboost_thread
 

diff --git a/snapper.spec.in b/snapper.spec.in
index 03c50a51d601661a2b31750dc3cf7d10f83c501b..b0a7140ee3c7f534128db9c1c7a6410d8525439c 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -27,6 +27,7 @@ Patch1:               no-readonly.diff
 Prefix:                /usr
 BuildRequires: boost-devel doxygen gcc-c++ libtool libxml2-devel
 BuildRequires: python-devel swig
+BuildRequires:  dbus-1-devel
 %if 0%{?suse_version}
 BuildRequires: libblocxx-devel
 %if 0%{?suse_version} >= 1210
@@ -87,10 +88,13 @@ rm -rf "$RPM_BUILD_ROOT"
 %files -f snapper.lang
 %defattr(-,root,root)
 %{prefix}/bin/snapper
+%{prefix}/sbin/snapperd
 %doc %{_mandir}/*/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/snapper
 /etc/cron.hourly/suse.de-snapper
 /etc/cron.daily/suse.de-snapper
+%config /etc/dbus-1/system.d/org.opensuse.snapper.conf
+%{prefix}/share/dbus-1/system-services/org.opensuse.snapper.service
 
 %package -n libsnapper@LIBVERSION_MAJOR@
 Summary:       Library for filesystem snapshot management