packages: ploop/ploop.spec - cleanups, pldize, todos; renamed -lib to -libs

[glen]

Author: glen                         Date: Wed May 16 06:13:41 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanups, pldize, todos; renamed -lib to -libs

---- Files affected:
packages/ploop:
   ploop.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ploop/ploop.spec
diff -u packages/ploop/ploop.spec:1.1 packages/ploop/ploop.spec:1.2
--- packages/ploop/ploop.spec:1.1	Tue May 15 23:55:50 2012
+++ packages/ploop/ploop.spec	Wed May 16 08:13:36 2012
@@ -1,31 +1,58 @@
 # $Revision$, $Date$
-%define _incdir /usr/include/ploop
-%define rel 1
+# TODO:
+# - triggerin modifying /lib/udev/rules.d/60-persistent-storage.rules is big
+#   NO, patch udev to include the change or make new .rule file
+# - should libploop.so be SONAME versioned?
+# - unbashism in *mount tools
 Summary:	ploop tools
 Name:		ploop
 Version:	1.2
-Release:	%{rel}%{?dist}
-License:	GNU GPL
+Release:	0.1
+License:	GPL v2
 Group:		Applications/System
-Source0:	http://download.openvz.org/utils/ploop/1.2/src/%{name}-%{version}.tar.bz2
+Source0:	http://download.openvz.org/utils/ploop/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRequires:	libxml2-devel
 Requires:	parted
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This package contains tools to work with ploop devices and images.
 
+%package libs
+Summary:	ploop library
+Group:		Libraries
+Obsoletes:	ploop-lib
+
+%description libs
+Parallels loopback (ploop) block device API library.
+
+%package devel
+Summary:	header files for ploop library
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+Headers ploop library.
+
 %prep
 %setup -q
 
 %build
-%{__make} LIBDIR=%{_libdir} all
+%{__make} all \
+	V=1 \
+	CC="%{__cc}" \
+	LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+	LIBDIR=%{_libdir} \
+	INSTALL="install -p" \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/%{_sbindir}
-%{__make} DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
+# static not packaged
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libploop.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -39,38 +66,28 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/*
+%doc tools/README
+%attr(755,root,root) /sbin/mount.ploop
+%attr(755,root,root) /sbin/umount.ploop
 %attr(755,root,root) %{_sbindir}/ploop
-%attr(755,root,root) %{_sbindir}/ploop-*
+%attr(755,root,root) %{_sbindir}/ploop-balloon
+%attr(755,root,root) %{_sbindir}/ploop-copy
+%attr(755,root,root) %{_sbindir}/ploop-fsck
+%attr(755,root,root) %{_sbindir}/ploop-grow
+%attr(755,root,root) %{_sbindir}/ploop-merge
+%attr(755,root,root) %{_sbindir}/ploop-stat
 
-%package lib
-Summary:	ploop library
-Group:		Applications/System
-Requires:	libxml2
-
-%description lib
-Parallels loopback (ploop) block device API library
-
-%files lib
+%files libs
 %defattr(644,root,root,755)
-%dir %{_libdir}
 %attr(755,root,root) %{_libdir}/libploop.so
 %dir /var/lock/ploop
 
-%package devel
-Summary: Devel files for ploop
-Group:		Applications/System
-%description devel
-Headers and a static version of ploop library
-
 %files devel
 %defattr(644,root,root,755)
-%dir %{_libdir}
-%dir %{_incdir}
-%{_libdir}/libploop.a
-%{_incdir}/libploop.h
-%{_incdir}/ploop_if.h
-%{_incdir}/ploop1_image.h
+%dir %{_includedir}/ploop
+%{_includedir}/ploop/libploop.h
+%{_includedir}/ploop/ploop1_image.h
+%{_includedir}/ploop/ploop_if.h
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -78,6 +95,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/05/16 06:13:36  glen
+- cleanups, pldize, todos; renamed -lib to -libs
+
 Revision 1.1  2012/05/15 21:55:50  brushek
 - initial commit - builds
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/ploop/ploop.spec?r1=1.1&r2=1.2