- work on packaging

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 10dac5c9c29680c2178886af8cc82b3bf68925de..72ddfdceae76795540783f6e7ca6db7fe00796bd 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -14,12 +14,3 @@ Create_SOURCES = Create.cc
 
 CmpDirs_SOURCES = CmpDirs.cc
 
-exampledir = $(docdir)/examples
-
-example_DATA = List.cc Create.cc CmpDirs.cc
-
-EXTRA_DIST = $(example_DATA) Makefile.example
-
-install-data-local:
-       /usr/bin/install -d -p -m 755 $(DESTDIR)$(exampledir)
-       /usr/bin/install -p -m 644 Makefile.example $(DESTDIR)$(exampledir)/Makefile

diff --git a/package/snapper-rpmlintrc b/package/snapper-rpmlintrc
new file mode 100644 (file)
index 0000000..9c2c4f6
--- /dev/null
+++ b/package/snapper-rpmlintrc
@@ -0,0 +1 @@
+addFilter("shlib-policy-name-error")

diff --git a/snapper.spec.in b/snapper.spec.in
index 804799a84dc7a2a1e355a238c71c92c419aa8e72..73e67e147f15b7725f6da9603920a78857542bff 100644 (file)
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -11,18 +11,13 @@ Group:              System/Libraries
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 Source:                snapper-%{version}.tar.bz2
 Source1:       snapper-rpmlintrc
-
-prefix:                /usr
-
+Prefix:                /usr
 BuildRequires: gcc-c++ boost-devel blocxx-devel doxygen dejagnu libxml2-devel
-
-Requires:      btrfs-progs
-
-PreReq:                %fillup_prereq
-Summary:       Library for snapper management
+Requires:      libsnapper = %version
+Summary:       Tool for filesystem snapshot management
 
 %description
-This package contains snapper, a library for filesystem snapshot management.
+This package contains snapper, a tool for filesystem snapshot management.
 
 Authors:
 --------
@@ -51,36 +46,50 @@ LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale make check
 %install
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-install -d -m 755 $RPM_BUILD_ROOT/var/lock/snapper
-
-%{find_lang} snapper
-
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
-%files -f snapper.lang
+%files
+%defattr(-,root,root)
+/usr/bin/snapper
+
+%package -n libsnapper
+Summary:       Library for filesystem snapper management
+Group:         Development/Languages/C and C++
+Requires:      btrfs-progs
+PreReq:                %fillup_prereq
+
+%description -n libsnapper
+This package contains header files and documentation for developing with
+libsnapper.
+
+Authors:
+--------
+    Arvin Schnell <aschnell@suse.de>
+
+%files -n libsnapper
 %defattr(-,root,root)
 %{_libdir}/libsnapper.so.*
-%dir /var/lock/libsnapper
-/var/adm/fillup-templates/sysconfig.snapper-libsnapper
-%doc %dir %{prefix}/share/doc/packages/libsnapper
 %doc %{prefix}/share/doc/packages/snapper/AUTHORS
 %doc %{prefix}/share/doc/packages/snapper/COPYING
+/var/adm/fillup-templates/sysconfig.snapper
+%dir /usr/lib/snapper/bin
+/usr/lib/snapper/bin/compare-dirs
 
-%post
+%post -n libsnapper
 /sbin/ldconfig
-%{fillup_only -an snapper}
+%{fillup_only -n snapper}
 
-%postun
+%postun -n libsnapper
 /sbin/ldconfig
 
-%package devel
+%package -n libsnapper-devel
 Requires:      libsnapper = %version
 Requires:      gcc-c++ libstdc++-devel boost-devel blocxx-devel libxml2-devel
 Summary:       Header files and documentation for libsnapper
 Group:         Development/Languages/C and C++
 
-%description devel
+%description -n libsnapper-devel
 This package contains header files and documentation for developing with
 libsnapper.
 
@@ -88,11 +97,8 @@ Authors:
 --------
     Arvin Schnell <aschnell@suse.de>
 
-%files devel
+%files -n libsnapper-devel
 %defattr(-,root,root)
 %{_libdir}/libsnapper.la
 %{_libdir}/libsnapper.so
 %{prefix}/include/snapper
-%doc %{prefix}/share/doc/packages/libsnapper/autodocs
-%doc %{prefix}/share/doc/packages/libsnapper/examples
-

diff --git a/snapper/Makefile.am b/snapper/Makefile.am
index 775b5d439fe031e9a184b4cb83eec1031287ef3d..5df0561b0bdf6031605fa43c7e1a13b73ed562a3 100644 (file)
--- a/snapper/Makefile.am
+++ b/snapper/Makefile.am
@@ -24,5 +24,8 @@ libsnapper_la_LIBADD = -lblocxx -lxml2
 pkgincludedir = $(includedir)/snapper
 
 pkginclude_HEADERS =                                   \
-       SnapperInterface.h
+       SnapperInterface.h                              \
+       Snapper.h                                       \
+       Snapshot.h                                      \
+       File.h