[packages/unixODBC] Create empty ini files for packaging Use rm macros Clean up docs in separate directory to allow shor

baggins baggins at pld-linux.org
Wed Aug 8 15:01:17 CEST 2012


commit 9facd9b15d89c7208bb961d912831a4fc807f5de
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Aug 8 15:00:08 2012 +0200

    Create empty ini files for packaging
    Use rm macros
    Clean up docs in separate directory to allow short-circuit installs

 unixODBC.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/unixODBC.spec b/unixODBC.spec
index f6059a1..86a1228 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -79,18 +79,24 @@ Biblioteki statyczne unixODBC.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+
+:> $RPM_BUILD_ROOT%{_sysconfdir}/odbc.ini
+:> $RPM_BUILD_ROOT%{_sysconfdir}/odbcinst.ini
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-find doc -name 'Makefile*' | xargs -r rm -f
+%{__rm} -rf doc-install
+cp -a doc doc-install
+find doc-install  -name 'Makefile*' | xargs -r %{__rm}
 
 # libodbccr.so.1 is lt_dlopened
-rm $RPM_BUILD_ROOT%{_libdir}/libodbccr.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libodbccr.{la,a}
 # Setup drivers are lt_dlopened by given name (.so or SONAME)
-rm $RPM_BUILD_ROOT%{_libdir}/lib{esoob,mimer,odbc{drvcfg{1,2},mini,my,nn,psql,txt},oplodbc,oraodbc,sapdb,tds}S.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{esoob,mimer,odbc{drvcfg{1,2},mini,my,nn,psql,txt},oplodbc,oraodbc,sapdb,tds}S.{la,a}
 # Drivers are lt_dlopened by given name (.so or SONAME)
-rm $RPM_BUILD_ROOT%{_libdir}/lib{nn,odbcpsql,template}.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{nn,odbcpsql,template}.{la,a}
 
 # (temporarily) missing in make install
 install include/autotest.h $RPM_BUILD_ROOT%{_includedir}
@@ -119,7 +125,7 @@ EOF
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README doc/AdministratorManual doc/UserManual
+%doc AUTHORS ChangeLog README doc-install/AdministratorManual doc-install/UserManual
 %attr(755,root,root) %{_bindir}/dltest
 %attr(755,root,root) %{_bindir}/isql
 %attr(755,root,root) %{_bindir}/iusql
@@ -194,7 +200,7 @@ EOF
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog doc/{ProgrammerManual,lst}
+%doc ChangeLog doc-install/{ProgrammerManual,lst}
 %{_libdir}/libodbc.la
 %{_libdir}/libodbcinst.la
 %{_includedir}/autotest.h


More information about the pld-cvs-commit mailing list