SPECS: sope.spec - correct R BR and %files (previous commit)

wolvverine wolvverine at pld-linux.org
Wed Sep 14 01:36:42 CEST 2005


Author: wolvverine                   Date: Tue Sep 13 23:36:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- correct R BR and %files (previous commit)

---- Files affected:
SPECS:
   sope.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/sope.spec
diff -u SPECS/sope.spec:1.15 SPECS/sope.spec:1.16
--- SPECS/sope.spec:1.15	Sun Sep 11 16:38:02 2005
+++ SPECS/sope.spec	Wed Sep 14 01:36:37 2005
@@ -64,11 +64,6 @@
 %define		gscpu		%(echo %{_target_cpu} | sed -e 's/amd64/x86_64/;s/ppc/powerpc/')
 %endif
 
-%define 		sope_libversion		4.5
-%define		sope_major_version	4
-%define		sope_minor_version	5
-
-
 %description
 The SOPE package is an extensive set of frameworks (16 frameworks,
 ~1500 classes) which form a complete Web application server
@@ -108,7 +103,9 @@
 %package xml-devel
 Summary:      Development files for the SOPE XML libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-xml libxml2-devel
+#Requires:     ogo-gnustep_make
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     libxml2-devel
 AutoReqProv:  off
 
 %description xml-devel
@@ -120,7 +117,7 @@
 %package xml-tools
 Summary:      Tools (domxml/saxxml/xmln)
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-xml
+Requires:     %{name}-xml = %{version}-%{release}
 AutoReqProv:  off
 
 %description xml-tools
@@ -136,7 +133,8 @@
 %package core
 Summary:      Core libraries of the SOPE application server
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     libfoundation
 AutoReqProv:  off
 
 %description core
@@ -151,7 +149,7 @@
 %package core-devel
 Summary:      Development files for the SOPE core libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-core
+#Requires:     ogo-gnustep_make
 AutoReqProv:  off
 
 %description core-devel
@@ -164,7 +162,9 @@
 %package mime
 Summary:      SOPE libraries for MIME processing
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
+Requires:     %{name}-core = %{version}-%{release}
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     libfoundation
 AutoReqProv:  off
 
 %description mime
@@ -180,7 +180,7 @@
 %package mime-devel
 Summary:      Development files for the SOPE MIME libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-mime
+#Requires:     ogo-gnustep_make
 AutoReqProv:  off
 
 %description mime-devel
@@ -193,7 +193,10 @@
 %package appserver
 Summary:      SOPE application server libraries
 Group:        Development/Libraries
-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}
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     %{name}-core = %{version}-%{release}
+Requires:     %{name}-mime = %{version}-%{release}
+Requires:     libfoundation
 AutoReqProv:  off
 
 %description appserver
@@ -213,7 +216,8 @@
 %package appserver-devel
 Summary:      Development files for the SOPE application server libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-appserver
+#Requires:     ogo-gnustep_make
+Requires:     %{name}-appserver = %{version}-%{release}
 AutoReqProv:  off
 
 %description appserver-devel
@@ -226,7 +230,7 @@
 %package appserver-tools
 Summary:      Tools shipped with the SOPE application server
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-appserver
+Requires:     %{name}-appserver = %{version}-%{release}
 AutoReqProv:  off
 
 %description appserver-tools
@@ -240,7 +244,9 @@
 %package ldap
 Summary:      SOPE libraries for LDAP access
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
+Requires:     %{name}-core = %{version}-%{release}
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     libfoundation
 AutoReqProv:  off
 
 %description ldap
@@ -253,7 +259,8 @@
 %package ldap-devel
 Summary:      Development files for the SOPE LDAP libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-ldap
+#Requires:     ogo-gnustep_make
+Requires:     %{name}-ldap = %{version}-%{release}
 AutoReqProv:  off
 
 %description ldap-devel
@@ -266,7 +273,7 @@
 %package ldap-tools
 Summary:      Tools (ldap2dsml/ldapchkpwd/ldapls)
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-ldap
+Requires:     %{name}-ldap = %{version}-%{release}
 AutoReqProv:  off
 
 %description ldap-tools
@@ -283,7 +290,9 @@
 %package ical
 Summary:      SOPE libraries for iCal handling
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-xml sope%{sope_major_version}%{sope_minor_version}-core libfoundation%{lfmaj}%{lfmin}
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     %{name}-core = %{version}-%{release}
+Requires:     libfoundation
 AutoReqProv:  off
 
 %description ical
@@ -296,7 +305,7 @@
 %package ical-devel
 Summary:      Development files for the SOPE iCal libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-ical
+#Requires:     ogo-gnustep_make
 AutoReqProv:  off
 
 %description ical-devel
@@ -308,7 +317,9 @@
 %package gdl1
 Summary:      GNUstep database libraries for SOPE
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-core sope%{sope_major_version}%{sope_minor_version}-xml libfoundation%{lfmaj}%{lfmin}
+Requires:     %{name}-core = %{version}-%{release}
+Requires:     %{name}-xml = %{version}-%{release}
+Requires:     libfoundation
 AutoReqProv:  off
 
 %description gdl1
@@ -321,7 +332,7 @@
 %package gdl1-postgresql
 Summary:      PostgreSQL connector for SOPE's fork of the GNUstep database environment
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-gdl1
+Requires:     %{name}-gdl1 = %{version}-%{release}
 AutoReqProv:  off
 %if %{?_postgresql_server_is_within_postgresql:1}%{!?_postgresql_server_is_within_postgresql:0}
 Requires: postgresql
@@ -339,7 +350,7 @@
 %package gdl1-mysql
 Summary:      MySQL connector for SOPE's fork of the GNUstep database environment
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-gdl1
+Requires:     %{name}-gdl1 = %{version}-%{release}
 AutoReqProv:  off
 
 %description gdl1-mysql
@@ -349,7 +360,7 @@
 #%package gdl1-sqlite3
 #Summary:      SQLite3 connector for SOPE's fork of the GNUstep database environment
 #Group:        Development/Libraries
-#Requires:     sope%{sope_major_version}%{sope_minor_version}-gdl1
+#Requires:     %{name}-gdl1 = %{version}-%{release}
 #AutoReqProv:  off
 #
 #%description gdl1-sqlite3
@@ -362,7 +373,7 @@
 %package gdl1-tools
 Summary:      Tools (gcs_cat/gcs_gensql/gcs_ls/gcs_mkdir/gcs_recreatequick)
 Group:        Development/Libraries
-Requires:     sope%{sope_major_version}%{sope_minor_version}-gdl1
+Requires:     %{name}-gdl1 = %{version}-%{release}
 AutoReqProv:  off
 
 %description gdl1-tools
@@ -374,7 +385,9 @@
 %package gdl1-devel
 Summary:      Development files for the GNUstep database libraries
 Group:        Development/Libraries
-Requires:     ogo-gnustep_make sope%{sope_major_version}%{sope_minor_version}-gdl1 postgresql-devel
+#Requires:     ogo-gnustep_make
+Requires:     %{name}-gdl1 = %{version}-%{release}
+Requires:     postgresql-devel
 AutoReqProv:  off
 
 %description gdl1-devel
@@ -450,11 +463,11 @@
 
 %files xml
 %defattr(-,root,root,-)
-%{_libdir}/libDOM*.so.%{sope_libversion}*
-%{_libdir}/libSaxObjC*.so.%{sope_libversion}*
-%{_libdir}/libXmlRpc*.so.%{sope_libversion}*
-%{_libdir}/sope-%{sope_libversion}/saxdrivers/libxmlSAXDriver.sax
-%{_libdir}/sope-%{sope_libversion}/saxdrivers/STXSaxDriver.sax
+%{_libdir}/libDOM*.so.%{version}*
+%{_libdir}/libSaxObjC*.so.%{version}*
+%{_libdir}/libXmlRpc*.so.%{version}*
+%{_libdir}/%{name}-%{version}/saxdrivers/libxmlSAXDriver.sax
+%{_libdir}/%{name}-%{version}/saxdrivers/STXSaxDriver.sax
 
 %files xml-tools
 %defattr(-,root,root,-)
@@ -473,9 +486,9 @@
 
 %files core
 %defattr(-,root,root,-)
-%{_libdir}/libEOControl*.so.%{sope_libversion}*
-%{_libdir}/libNGExtensions*.so.%{sope_libversion}*
-%{_libdir}/libNGStreams*.so.%{sope_libversion}*
+%{_libdir}/libEOControl*.so.%{version}*
+%{_libdir}/libNGExtensions*.so.%{version}*
+%{_libdir}/libNGStreams*.so.%{version}*
 
 %files core-devel
 %defattr(-,root,root,-)
@@ -488,7 +501,7 @@
 
 %files mime
 %defattr(-,root,root,-)
-%{_libdir}/libNGMime*.so.%{sope_libversion}*
+%{_libdir}/libNGMime*.so.%{version}*
 
 %files mime-devel
 %defattr(-,root,root,-)
@@ -499,24 +512,24 @@
 
 %files appserver
 %defattr(-,root,root,-)
-%{_libdir}/libNGObjWeb*.so.%{sope_libversion}*
-%{_libdir}/libNGXmlRpc*.so.%{sope_libversion}*
-%{_libdir}/libSoOFS*.so.%{sope_libversion}*
-%{_libdir}/libWEExtensions*.so.%{sope_libversion}*
-%{_libdir}/libWOExtensions*.so.%{sope_libversion}*
-%{_libdir}/libWOXML*.so.%{sope_libversion}*
-%{_datadir}/sope-%{sope_libversion}/ngobjweb/DAVPropMap.plist
-%{_datadir}/sope-%{sope_libversion}/ngobjweb/Defaults.plist
-%{_datadir}/sope-%{sope_libversion}/ngobjweb/Languages.plist
-%{_libdir}/sope-%{sope_libversion}/products/SoCore.sxp
-%{_libdir}/sope-%{sope_libversion}/products/SoOFS.sxp
-%{_libdir}/sope-%{sope_libversion}/wox-builders/WEExtensions.wox
-%{_libdir}/sope-%{sope_libversion}/wox-builders/WOExtensions.wox
+%{_libdir}/libNGObjWeb*.so.%{version}*
+%{_libdir}/libNGXmlRpc*.so.%{version}*
+%{_libdir}/libSoOFS*.so.%{version}*
+%{_libdir}/libWEExtensions*.so.%{version}*
+%{_libdir}/libWOExtensions*.so.%{version}*
+%{_libdir}/libWOXML*.so.%{version}*
+%{_datadir}/%{name}-%{version}/ngobjweb/DAVPropMap.plist
+%{_datadir}/%{name}-%{version}/ngobjweb/Defaults.plist
+%{_datadir}/%{name}-%{version}/ngobjweb/Languages.plist
+%{_libdir}/%{name}-%{version}/products/SoCore.sxp
+%{_libdir}/%{name}-%{version}/products/SoOFS.sxp
+%{_libdir}/%{name}-%{version}/wox-builders/WEExtensions.wox
+%{_libdir}/%{name}-%{version}/wox-builders/WOExtensions.wox
 
 
 %files appserver-tools
 %defattr(-,root,root,-)
-%{_sbindir}/sope-%{sope_major_version}.%{sope_minor_version}
+%{_sbindir}/%{name}-%{version}
 %{_bindir}/xmlrpc_call
 
 %files appserver-devel
@@ -541,7 +554,7 @@
 
 %files ldap
 %defattr(-,root,root,-)
-%{_libdir}/libNGLdap*.so.%{sope_libversion}*
+%{_libdir}/libNGLdap*.so.%{version}*
 
 %files ldap-tools
 %defattr(-,root,root,-)
@@ -556,9 +569,9 @@
 
 %files ical
 %defattr(-,root,root,-)
-%{_libdir}/libNGiCal*.so.%{sope_libversion}*
-%{_datadir}/sope-%{sope_libversion}/saxmappings/NGiCal.xmap
-%{_libdir}/sope-%{sope_libversion}/saxdrivers/versitSaxDriver.sax
+%{_libdir}/libNGiCal*.so.%{version}*
+%{_datadir}/%{name}-%{version}/saxmappings/NGiCal.xmap
+%{_libdir}/%{name}-%{version}/saxdrivers/versitSaxDriver.sax
 
 %files ical-devel
 %defattr(-,root,root,-)
@@ -569,20 +582,20 @@
 %defattr(-,root,root,-)
 %{_bindir}/connect-EOAdaptor
 %{_bindir}/load-EOAdaptor
-%{_libdir}/libGDLAccess*.so.%{sope_libversion}*
-%{_libdir}/libGDLContentStore*.so.%{sope_libversion}*
+%{_libdir}/libGDLAccess*.so.%{version}*
+%{_libdir}/libGDLContentStore*.so.%{version}*
 
 %files gdl1-postgresql
 %defattr(-,root,root,-)
-%{_libdir}/sope-%{sope_libversion}/dbadaptors/PostgreSQL.gdladaptor
+%{_libdir}/%{name}-%{version}/dbadaptors/PostgreSQL.gdladaptor
 
 #%files gdl1-mysql
 #%defattr(-,root,root,-)
-#%{_libdir}/sope-%{sope_libversion}/dbadaptors/MySQL.gdladaptor
+#%{_libdir}/%{name}-%{version}/dbadaptors/MySQL.gdladaptor
 
 #%files gdl1-sqlite3
 #%defattr(-,root,root,-)
-#%{_libdir}/sope-%{sope_libversion}/dbadaptors/SQLite3.gdladaptor
+#%{_libdir}/%{name}-%{version}/dbadaptors/SQLite3.gdladaptor
 
 %files gdl1-tools
 %defattr(-,root,root,-)
@@ -606,6 +619,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2005/09/13 23:36:37  wolvverine
+- correct R BR and %files (previous commit)
+
 Revision 1.15  2005/09/11 14:38:02  czarny
 - made it build outside gnustep
 - taken whole %file section from spec file included with sources
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sope.spec?r1=1.15&r2=1.16&f=u




More information about the pld-cvs-commit mailing list