From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 26 Apr 2012 16:24:03 +0000 (+0200)
Subject: - work on packaging
X-Git-Tag: v0.1.3~237
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c20e4597e46e1a18e86b6e83b4da73bb63f6f84;p=thirdparty%2Fsnapper.git

- work on packaging
---

diff --git a/client/Makefile.am b/client/Makefile.am
index 7c049593..8341a6f9 100644
--- 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 53281f38..4074c8c8 100644
--- 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 9355a9b8..e299af10 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1 +1,2 @@
 snapper.8
+snapperd.8
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a78c56f2..87f27207 100644
--- 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
index 00000000..e69de29b
diff --git a/server/Makefile.am b/server/Makefile.am
index 4f39cf85..a59a2be6 100644
--- 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 03c50a51..b0a7140e 100644
--- 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