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

9 files changed, 78 insertions, 9 deletions

diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 9b42341fe..e497cafb2 100755
--- 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
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
index 2c9c763cf..a79c06e55 100644
--- 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.*
diff --git 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
index 38fff184a..3e1bd40fb 100644
--- 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.*
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index 20f0ad55b..fbeb990ed 100644
--- 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.*
 
diff --git a/redhat/dependencies/qt3/qt3-3.3.8.d.spec b/redhat/dependencies/qt3/qt3-3.3.8.d.spec
index afb20801a..53f53e976 100644
--- 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,-)
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
index 77505c221..5d5f57670 100644
--- 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
diff --git a/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec b/redhat/dependencies/tqscintilla/trinity-tqscintilla.spec
index 3742b868f..1c23e0bee 100644
--- 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
diff --git a/redhat/dependencies/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec
index 2a9beed91..4353bb06e 100644
--- 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,-)
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index bcbf1ed2a..598e2d874 100755
--- 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.*