[Mach-cvs] CVS: mach2 ChangeLog, 1.315, 1.316 mach.spec.in, 1.53, 1.54

[Thomas V. S. <tho...@us...>]

Update of /cvsroot/mach/mach2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12826

Modified Files:
	ChangeLog mach.spec.in 
Log Message:
	* mach.spec.in:
	  rpmlint spec fixes.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/mach/mach2/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -C2 -d -r1.315 -r1.316
*** ChangeLog	14 Nov 2009 16:43:54 -0000	1.315
--- ChangeLog	14 Nov 2009 17:35:17 -0000	1.316
***************
*** 1,4 ****
--- 1,9 ----
  2009-11-14  Thomas Vander Stichele  <thomas at apestaart dot org>
  
+ 	* mach.spec.in:
+ 	  rpmlint spec fixes.
+ 
+ 2009-11-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+ 
  	* scripts/mach.in:
  	  More permission fixes based on feedback from Fredrik Unger.

Index: mach.spec.in
===================================================================
RCS file: /cvsroot/mach/mach2/mach.spec.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** mach.spec.in	29 Aug 2008 10:48:13 -0000	1.53
--- mach.spec.in	14 Nov 2009 17:35:17 -0000	1.54
***************
*** 2,25 ****
  Version:        @VERSION@
  Release:        @RELEASE@%{?dist}
! Summary:        make a chroot
  
  Group:          Applications/System
! License:	GPLv2+
  URL:            http://thomas.apestaart.org/projects/mach/
  Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
! Requires:	python
! Requires:	rpm
! Requires:	rpm-build
! Requires:	rpm-python
! Requires:	yum
! Requires:	createrepo
! Requires:	sed
! Requires:	cpio
  
! BuildRequires:	python
! BuildRequires:	gcc-c++
! BuildRequires:	libselinux-devel
  
  %{!?builduser:  %define builduser  @BUILDUSER@}
--- 2,25 ----
  Version:        @VERSION@
  Release:        @RELEASE@%{?dist}
! Summary:        Make a chroot
  
  Group:          Applications/System
! License:        GPLv2+
  URL:            http://thomas.apestaart.org/projects/mach/
  Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
! Requires:       python
! Requires:       rpm
! Requires:       rpm-build
! Requires:       rpm-python
! Requires:       yum
! Requires:       createrepo
! Requires:       sed
! Requires:       cpio
  
! BuildRequires:  python
! BuildRequires:  gcc-c++
! BuildRequires:  libselinux-devel
  
  %{!?builduser:  %define builduser  @BUILDUSER@}
***************
*** 43,49 ****
  %build
  %configure \
! 	--enable-builduser=%{builduser} \
! 	--enable-buildgroup=%{buildgroup} \
! 	--with-flavor=updates
  make
  
--- 43,49 ----
  %build
  %configure \
!         --enable-builduser=%{builduser} \
!         --enable-buildgroup=%{buildgroup} \
!         --with-flavor=updates
  make
  
***************
*** 51,54 ****
--- 51,58 ----
  rm -rf $RPM_BUILD_ROOT
  make install DESTDIR=$RPM_BUILD_ROOT
+ 
+ # no dev package
+ rm $RPM_BUILD_ROOT%{_libdir}/*.so
+ 
  install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/lib/mach
  install -d -m 2775 $RPM_BUILD_ROOT%{_localstatedir}/lib/mach/states
***************
*** 64,67 ****
--- 68,72 ----
  %pre
  groupadd -r mach >/dev/null 2>&1 || :
+ /sbin/ldconfig
  
  %preun
***************
*** 78,89 ****
    rm -rf %{_localstatedir}/tmp/mach > /dev/null 2>&1 || :
  fi
  
  %files
  %defattr(-,root,root,-)
! %doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
  %dir %{_sysconfdir}/mach
! %config %{_sysconfdir}/mach/conf
  %config(noreplace) %{_sysconfdir}/mach/location
! %config %{_sysconfdir}/mach/dist.d
  %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach
  %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/states
--- 83,95 ----
    rm -rf %{_localstatedir}/tmp/mach > /dev/null 2>&1 || :
  fi
+ /sbin/ldconfig
  
  %files
  %defattr(-,root,root,-)
! %doc ChangeLog COPYING README AUTHORS TODO FORGETMENOT RELEASE mach.doap
  %dir %{_sysconfdir}/mach
! %config(noreplace) %{_sysconfdir}/mach/conf
  %config(noreplace) %{_sysconfdir}/mach/location
! %config(noreplace) %{_sysconfdir}/mach/dist.d
  %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach
  %attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/states