RHEL/Fedora: fix %post and %postun in dependency packages

13 years ago · 14c1325537
parent 193ac9dc51
commit 14c1325537
9 changed files with 78 additions and 9 deletions
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@ -122,6 +122,19 @@ cd build
 %clean
 %__rm -rf %{?buildroot}

+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@ -112,6 +112,17 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
 %clean
 %__rm -rf %{?buildroot}

+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :

 %files
 %{tde_libdir}/*.so.*
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@ -73,6 +73,18 @@ cd build
 %clean
 %__rm -rf %{?buildroot}

+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
 %files
 %{tde_bindir}/dbusxml2qt3
 %{tde_libdir}/*.so.*
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@ -73,6 +73,18 @@ cd build
 %clean
 %__rm -rf %{?buildroot}

+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
 %files
 %{tde_libdir}/*.so.*

--- a/redhat/dependencies/qt3/qt3-3.3.8.d.spec
+++ b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
@ -548,9 +548,11 @@ mkdir -p %{buildroot}%{qtdir}/plugins/styles
 %clean
 rm -rf %{buildroot}

-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig

-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig

 %files
 %defattr(-,root,root,-)
--- a/redhat/dependencies/tqca/tqca.spec
+++ b/redhat/dependencies/tqca/tqca.spec
@ -60,8 +60,11 @@ make install INSTALL_ROOT=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT


-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig


 %files
--- a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
+++ b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
@ -130,9 +130,11 @@ done
 %__rm -rf $RPM_BUILD_ROOT


-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig

-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig


 %files
--- a/redhat/dependencies/tqt3/tqt3-3.4.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-3.4.0.spec
@ -507,9 +507,11 @@ done
 %clean
 %__rm -rf %{buildroot}

-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig

-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig

 %files
 %defattr(-,root,root,-)
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@ -92,7 +92,7 @@ cd build

 # RHEL 5: add newline at end of include files to avoid warnings
 %if 0%{?rhel} && 0%{?rhel} <= 5
-for i in %{?buildroot}%{_includedir}/*.h; do
+for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
  echo "" >>${i}
 done
 %endif
@ -106,6 +106,18 @@ done
 %clean
 %__rm -rf %{?buildroot}

+%post
+/sbin/ldconfig || :
+
+%postun
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
 %files
 %{tde_bindir}/*
 %{tde_libdir}/*.so.*