git-svn-id: http://svn.opengroupware.org/SOPE/trunk@573 e4a50df8-12e2-0310-a44c-efbce...

[sope] / maintenance / sope.spec

diff --git a/maintenance/sope.spec b/maintenance/sope.spec
index 4329f018dc664b5e16705c50bc8c781a468c08a6..a7721e65ab14d46ad9c17621b218ee1ae7a489b2 100644 (file)
--- a/maintenance/sope.spec
+++ b/maintenance/sope.spec
@@ -1,3 +1,6 @@
+%define lfmaj 1
+%define lfmin 0
+
 Summary:      SOPE.
 Name:         sope%{sope_major_version}%{sope_minor_version}
 Version:      %{sope_version}
@@ -20,7 +23,6 @@ sope
 %package xml
 Summary:      SOPE libraries for XML processing
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
 AutoReqProv:  off
 
 %description xml
@@ -36,7 +38,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package xml-devel
 Summary:      Development files for the SOPE XML libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-xml libxml2-devel
 AutoReqProv:  off
 
 %description xml-devel
@@ -48,7 +50,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package xml-tools
 Summary:      Tools (domxml/saxxml/xmln)
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-xml-devel
 AutoReqProv:  off
 
 %description xml-tools
@@ -64,7 +66,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package core
 Summary:      Core libraries of the SOPE application server
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
 AutoReqProv:  off
 
 %description core
@@ -79,7 +81,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package core-devel
 Summary:      Development files for the SOPE core libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-core
 AutoReqProv:  off
 
 %description core-devel
@@ -92,7 +94,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package mime
 Summary:      SOPE libraries for MIME processing
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
 AutoReqProv:  off
 
 %description mime
@@ -108,7 +110,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package mime-devel
 Summary:      Development files for the SOPE MIME libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-mime
 AutoReqProv:  off
 
 %description mime-devel
@@ -121,7 +123,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package appserver
 Summary:      SOPE application server libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-xml sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-mime libfoundation%{lfmaj}%{lfmin}
 AutoReqProv:  off
 
 %description appserver
@@ -141,7 +143,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package appserver-devel
 Summary:      Development files for the SOPE application server libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-appserver
 AutoReqProv:  off
 
 %description appserver-devel
@@ -154,7 +156,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package appserver-tools
 Summary:      Tools shipped with the SOPE application server
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-appserver
 AutoReqProv:  off
 
 %description appserver-tools
@@ -168,7 +170,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package ldap
 Summary:      SOPE libraries for LDAP access
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
 AutoReqProv:  off
 
 %description ldap
@@ -181,7 +183,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package ldap-devel
 Summary:      Development files for the SOPE LDAP libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-ldap
 AutoReqProv:  off
 
 %description ldap-devel
@@ -194,7 +196,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package ldap-tools
 Summary:      Tools (ldap2dsml/ldapchkpwd/ldapls)
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-ldap-devel
 AutoReqProv:  off
 
 %description ldap-tools
@@ -211,7 +213,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package ical
 Summary:      SOPE libraries for iCal handling
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-xml sope%{sope_major_version}%{sope_minor_version}-core libfoundation%{lfmaj}%{lfmin}
 AutoReqProv:  off
 
 %description ical
@@ -224,7 +226,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package ical-devel
 Summary:      Development files for the SOPE iCal libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-ical
 AutoReqProv:  off
 
 %description ical-devel
@@ -236,7 +238,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package gdl1
 Summary:      GNUstep database libraries for SOPE
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-core libfoundation%{lfmaj}%{lfmin}
 AutoReqProv:  off
 
 %description gdl1
@@ -249,8 +251,13 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package gdl1-postgresql
 Summary:      PostgreSQL connector for SOPE's fork of the GNUstep database environment
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     sope%{sope_major_version}%{sope_minor_version}-gdl1
 AutoReqProv:  off
+%if %{?_postgresql_server_is_within_postgresql:1}%{!?_postgresql_server_is_within_postgresql:0}
+Requires: postgresql
+%else
+Requires: postgresql-server
+%endif
 
 %description gdl1-postgresql
 This package contains the postgresql connector for SOPE's fork of the
@@ -262,7 +269,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 %package gdl1-devel
 Summary:      Development files for the GNUstep database libraries
 Group:        Development/Libraries
-#Requires:    ogo-gnustep_make
+Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-gdl1 postgresql-devel
 AutoReqProv:  off
 
 %description gdl1-devel
@@ -272,7 +279,6 @@ database libraries.
 SOPE is a framework for developing web applications and services. The
 name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE.
 ########################################
-
 %prep
 rm -fr ${RPM_BUILD_ROOT}
 %setup -n sope
@@ -297,13 +303,28 @@ rm -f ${RPM_BUILD_ROOT}%{prefix}/bin/rssparse
 rm -f ${RPM_BUILD_ROOT}%{prefix}/bin/testqp
 
 # ****************************** post *********************************
-%post
+%post appserver
+if [ $1 = 1 ]; then
+  if [ -d %{_sysconfdir}/ld.so.conf.d ]; then
+    echo "%{prefix}/lib" > %{_sysconfdir}/ld.so.conf.d/sope%{sope_major_version}%{sope_minor_version}.conf
+  elif [ ! "`grep '%{prefix}/lib' %{_sysconfdir}/ld.so.conf`" ]; then
+    echo "%{prefix}/lib" >> %{_sysconfdir}/ld.so.conf
+  fi
+  /sbin/ldconfig
+fi
 
 # ****************************** postun *********************************
-%postun
+%postun appserver
+if [ $1 = 0 ]; then
+  if [ -e %{_sysconfdir}/ld.so.conf.d/sope%{sope_major_version}%{sope_minor_version}.conf ]; then
+    rm -f %{_sysconfdir}/ld.so.conf.d/sope%{sope_major_version}%{sope_minor_version}.conf
+  fi
+  /sbin/ldconfig
+fi
 
 # ****************************** clean ********************************
 %clean
+rm -fr ${RPM_BUILD_ROOT}
 
 # ****************************** files ********************************
 %files xml
@@ -439,6 +460,11 @@ rm -f ${RPM_BUILD_ROOT}%{prefix}/bin/testqp
 
 # ********************************* changelog *************************
 %changelog
+* Fri Jan 28 2005 Frank Reppin <frank@opengroupware.org>
+- reworked dependencies
+- deal with ld.so.conf in (post|preun) of appserver rather than core
+* Tue Jan 25 2005 Frank Reppin <frank@opengroupware.org>
+- fix for OGo Bug #1192
 * Tue Jan 11 2005 Frank Reppin <frank@opengroupware.org>
 - reworked all summaries and descriptions (taken from Debian control
   to be honest :>)