- some cleanups/unifications, no attr(-,,)

- maxpath patch removed (missing in repo and not needed with fixed gkh)

Changed files:
    util-vserver.spec -> 1.7

diff --git a/util-vserver.spec b/util-vserver.spec
index 433067a801a03a307db90a7f22859ce8587e277f..9affa7dbf8769823f551b63d3ed1e48848fe58c5 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -12,7 +12,6 @@ License:      GPL
 Group:         Base
 Source0:       http://www.13thfloor.at/vserver/d_release/v1.3.6/%{name}-%{version}.tar.bz2
 # Source0-md5: d5d4330dc95dbf70bac9b24d53d1e779
-Patch0:                %{name}-maxpath.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: e2fsprogs-devel
 PreReq:                rc-scripts
@@ -40,44 +39,42 @@ Wymaga to specjalnego j
 new_s_context i set_ipv4root.
 
 %package devel
-Summary:        Libraries for the linux vserver programs
-Summary(pl):    Biblioteki u¿ywane do sterowania linuksowym vserwerem
+Summary:       Development files for Linux vserver libraries
+Summary(pl):   Pliki programistyczne dla bibliotek linuksowego vserwera
 Group:          Development/Libraries
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
-This package contains the header and object files necessary for
-developing programs which use vserver library.
+This package contains the development files necessary for developing
+programs which use vserver library.
 
 %description devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe i bibliotekê konieczn± do rozwoju
+Ten pakiet zawiera pliki programistyczne konieczne do rozwijania
 programów u¿ywaj±cych biblioteki vserver.
 
 %package static
-Summary:        Static Libraries for the linux vserver programs
-Summary(pl):    Biblioteki statyczne u¿ywane do sterowania linuksowym vserwerem
+Summary:        Static vserver library
+Summary(pl):    Biblioteka statyczna vservera
 Group:          Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-This package contains the header and object files necessary for
-developing programs which use vserver library.
+This package contains the static version of vserver library.
 
 %description static -l pl
-Ten pakiet zawiera pliki nag³ówkowe i bibliotekê konieczn± do rozwoju
-programów u¿ywaj±cych biblioteki vserver.
+Ten pakiet zawiera statyczn± wersjê biblioteki vservera.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure \
+%configure
 #      --with-kerneldir=%{_kernelsrcdir}
 %{__make}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT/vservers
 
 %{__make} install \
@@ -85,26 +82,64 @@ install -d $RPM_BUILD_ROOT/vservers
 
 rm -f $RPM_BUILD_ROOT%{_sbindir}/util-vserver-vars
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt
 %attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/defaults
+%dir %{_libdir}/%{name}/distributions
+%{_libdir}/%{name}/distributions/defaults
+%{_libdir}/%{name}/distributions/fc1
+%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat
+%{_libdir}/%{name}/distributions/rh9
+%attr(755,root,root) %{_libdir}/%{name}/legacy
+%attr(755,root,root) %{_libdir}/%{name}/capchroot
+%attr(755,root,root) %{_libdir}/%{name}/chroot-*
+%attr(755,root,root) %{_libdir}/%{name}/exec-ulimit
+%attr(755,root,root) %{_libdir}/%{name}/fakerunlevel
+%attr(755,root,root) %{_libdir}/%{name}/filetime
+%attr(755,root,root) %{_libdir}/%{name}/filetime
+%{_libdir}/%{name}/functions
+%attr(755,root,root) %{_libdir}/%{name}/ifspec
+%attr(755,root,root) %{_libdir}/%{name}/listdevip
+%attr(755,root,root) %{_libdir}/%{name}/mask2prefix
+%attr(755,root,root) %{_libdir}/%{name}/parserpmdump
+%attr(755,root,root) %{_libdir}/%{name}/pipe-sync
+%attr(755,root,root) %{_libdir}/%{name}/readlink
+%attr(755,root,root) %{_libdir}/%{name}/rootshell
+%attr(755,root,root) %{_libdir}/%{name}/rpm-fake*
+%attr(755,root,root) %{_libdir}/%{name}/save_ctxinfo
+%attr(755,root,root) %{_libdir}/%{name}/secure-mount
+%attr(755,root,root) %{_libdir}/%{name}/showperm
+%{_libdir}/%{name}/util-vserver-vars
+%attr(755,root,root) %{_libdir}/%{name}/vapt-get-worker
+%attr(755,root,root) %{_libdir}/%{name}/vbuild
+%attr(755,root,root) %{_libdir}/%{name}/vcheck
+%attr(755,root,root) %{_libdir}/%{name}/vpkg
+%attr(755,root,root) %{_libdir}/%{name}/vreboot
+%attr(755,root,root) %{_libdir}/%{name}/vrpm-*
+%attr(755,root,root) %{_libdir}/%{name}/vserver-build
+%{_libdir}/%{name}/vserver-build.*
+%{_libdir}/%{name}/vserver-setup.functions
+%{_libdir}/%{name}/vserver.*
+%attr(755,root,root) %{_libdir}/%{name}/vservers.grabinfo.sh
+%attr(755,root,root) %{_libdir}/%{name}/vunify
 %{_mandir}/man8/*
 %attr(0,root,root) %dir /vservers
-%attr(-,root,root) %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/vserver.h
-%{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
+%{_includedir}/vserver.h
 %{_pkgconfigdir}/*.pc
 
 %files static