[svn] r5837 - in trunk/rpms: cppunit libxml++ perl-Filesys-SmbClient

Wed Sep 12 14:09:10 CEST 2007

Author: dag
Date: 2007-09-12 14:09:07 +0200 (Wed, 12 Sep 2007)
New Revision: 5837

Modified:
   trunk/rpms/cppunit/cppunit.spec
   trunk/rpms/libxml++/libxml++.spec
   trunk/rpms/perl-Filesys-SmbClient/perl-Filesys-SmbClient.spec
Log:
Updates

Modified: trunk/rpms/cppunit/cppunit.spec
===================================================================

--- trunk/rpms/cppunit/cppunit.spec	2007-09-11 20:49:21 UTC (rev 5836)
+++ trunk/rpms/cppunit/cppunit.spec	2007-09-12 12:09:07 UTC (rev 5837)
@@ -1,17 +1,17 @@
 # $Id$
-# Authority:    hadams
+# Authority: hadams
 
+Summary: C++ unit testing framework
 Name: cppunit
 Version: 1.12.0
 Release: 3
-
-Summary: C++ unit testing framework
 License: LGPL
 Group: Development/Libraries
-Url: http://cppunit.sourceforge.net/
-Source: http://download.sf.net/cppunit/cppunit-%{version}.tar.gz
+URL: http://cppunit.sourceforge.net/
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source: http://dl.sf.net/cppunit/cppunit-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: doxygen, graphviz
 
 %description
@@ -19,67 +19,58 @@
 Test output is in XML for automatic testing and GUI based for supervised tests.
 
 %package devel
-Summary: Libraries and headers for cppunit development
+Summary: Header files, libraries and development documentation for %{name}.
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: cppunit-doc = %{version}-%{release}
+Obsoletes: cppunit-doc <= %{version}-%{release}
 
 %description devel
-This package contains the libraries and headers necessary for developing
-programs that use cppunit.
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
 
-%package doc
-Summary: HTML formatted API documention for cppunit
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-
-%description doc
-The cppunit-doc package contains HTML formatted API documention generated by
-the popular doxygen documentation generation tool.
-
 %prep
-%setup -q
+%setup
 
 %build
 %configure --enable-doxygen
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-# remove double of doc
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/cppunit
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{_datadir}/cppunit/
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
+%doc AUTHORS BUGS ChangeLog COPYING NEWS README THANKS TODO doc/FAQ
+%doc %{_mandir}/man1/*.1*
 %{_bindir}/DllPlugInTester
-%{_mandir}/man1/*
-%{_datadir}/aclocal/*
+%{_datadir}/aclocal/cppunit.m4
 %{_libdir}/libcppunit*.so.*
-%doc AUTHORS COPYING NEWS README THANKS ChangeLog TODO BUGS doc/FAQ
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-, root, root, 0755)
+%doc doc/html/*
 %{_bindir}/cppunit-config
-%{_includedir}/cppunit
+%{_includedir}/cppunit/
 %{_libdir}/libcppunit.a
 %{_libdir}/libcppunit.so
 %{_libdir}/pkgconfig/cppunit.pc
+%exclude %{_libdir}/libcppunit.la
 
-%files doc
-%defattr(-,root,root,-)
-%doc doc/html/*
-
 %changelog
-* Thu Sep 11 2007 Heiko Adams <info at fedora-blog.de> 1.12.0-3
-- rebuild for rpmforge
+* Thu Sep 11 2007 Heiko Adams <info at fedora-blog.de> - 1.12.0-3
+- Rebuild for RPMforge.
 
 * Sun Sep 10 2006 Patrice Dumas <pertusus at free.fr> 1.12.0-2
 - rebuild for FC6

Modified: trunk/rpms/libxml++/libxml++.spec
===================================================================
--- trunk/rpms/libxml++/libxml++.spec	2007-09-11 20:49:21 UTC (rev 5836)
+++ trunk/rpms/libxml++/libxml++.spec	2007-09-12 12:09:07 UTC (rev 5837)
@@ -2,7 +2,7 @@
 # Authority: dag
 # Upstream: <libxmlplusplus-general$lists,sf,net>
 
-Summary: C++ interface for working with XML files
+Summary: C++ wrapper for working with XML files
 Name: libxml++
 Version: 2.19.1
 Release: 1

Modified: trunk/rpms/perl-Filesys-SmbClient/perl-Filesys-SmbClient.spec
===================================================================
--- trunk/rpms/perl-Filesys-SmbClient/perl-Filesys-SmbClient.spec	2007-09-11 20:49:21 UTC (rev 5836)
+++ trunk/rpms/perl-Filesys-SmbClient/perl-Filesys-SmbClient.spec	2007-09-12 12:09:07 UTC (rev 5837)
@@ -2,8 +2,8 @@
 # Authority: dries
 # Upstream: Alain Barbet <alian$alianwebserver,com>
 
-%define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)
-%define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
 %define real_name Filesys-SmbClient
 
@@ -15,7 +15,7 @@
 Group: Applications/CPAN
 URL: http://search.cpan.org/dist/Filesys-SmbClient/
 
-Source: http://search.cpan.org/CPAN/authors/id/A/AL/ALIAN/Filesys-SmbClient-%{version}.tar.gz
+Source: http://www.cpan.org/modules/by-module/Filesys/Filesys-SmbClient-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: perl, perl(ExtUtils::MakeMaker), samba-common
@@ -27,24 +27,25 @@
 %setup -n %{real_name}-%{version}
 
 %build
-echo | %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
-%{__make} %{?_smp_mflags}
+echo | CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"
+%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install
-%{__rm} -rf %{buildroot}%{perl_archlib}/perllocal.pod %{buildroot}%{perl_vendorarch}/auto/*/*/.packlist
+%{__make} pure_install
 
+### Clean up buildroot
+find %{buildroot} -name .packlist -exec %{__rm} {} \;
+
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes README
-%doc %{_mandir}/man3/Filesys::SmbClient*
+%doc Changes COPYING MANIFEST META.yml README
+%doc %{_mandir}/man3/Filesys::SmbClient.3pm*
 %dir %{perl_vendorarch}/Filesys/
 %{perl_vendorarch}/Filesys/SmbClient.pm
-%dir %{perl_vendorarch}/auto/
 %dir %{perl_vendorarch}/auto/Filesys/
 %{perl_vendorarch}/auto/Filesys/SmbClient/
 

