packages: qt4/qt4.spec - rm unneeded BR postgresql-static - fixed %install ...

charles charles at pld-linux.org
Sun Sep 26 16:02:48 CEST 2010


Author: charles                      Date: Sun Sep 26 14:02:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rm unneeded BR postgresql-static
- fixed %install for without static_libs bcond

---- Files affected:
packages/qt4:
   qt4.spec (1.267 -> 1.268) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.267 packages/qt4/qt4.spec:1.268
--- packages/qt4/qt4.spec:1.267	Sun Sep 26 15:03:40 2010
+++ packages/qt4/qt4.spec	Sun Sep 26 16:02:40 2010
@@ -102,7 +102,6 @@
 BuildRequires:	pkgconfig
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel}
 %{?with_pgsql:BuildRequires:	postgresql-devel}
-%{?with_pgsql:BuildRequires:	postgresql-static}
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
@@ -1739,8 +1738,10 @@
 for a in $(sed -e '/%defattr/d;s/\(%dir\|%attr[^ ]\+\) //;' < phonon-devel.files); do
 	rm -rf $RPM_BUILD_ROOT$a
 done
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libphonon.so.*
+%if %{with static_libs}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libphonon.a
+%endif
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libphonon.so.*
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/phonon_backend/libphonon_gstreamer.so
 %endif
 
@@ -2321,6 +2322,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.268  2010/09/26 14:02:40  charles
+- rm unneeded BR postgresql-static
+- fixed %install for without static_libs bcond
+
 Revision 1.267  2010/09/26 13:03:40  qboosh
 - qt4 uses internal gif decoder, not libgif
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.267&r2=1.268&f=u



More information about the pld-cvs-commit mailing list