2006-02-23 Damien Carbery <[email protected]>
authordc144907
Thu, 23 Feb 2006 17:41:17 +0000
changeset 6826 42cc47455ddc
parent 6825 390de7c7415b
child 6827 8f5cfa8beb12
2006-02-23 Damien Carbery <[email protected]> * Solaris.inc: Define default_category so that it can be added to in the Evolution packages. * SUNWevolution-data-server.spec, SUNWevolution-exchange.spec, SUNWevolution-jescs.spec, SUNWevolution-libs.spec, SUNWevolution.spec, SUNWevolution-webcal.spec: Use default pkg version to match other pkgs; add EVO25 to default category.
Solaris/ChangeLog
Solaris/SUNWevolution-data-server.spec
Solaris/SUNWevolution-exchange.spec
Solaris/SUNWevolution-jescs.spec
Solaris/SUNWevolution-libs.spec
Solaris/SUNWevolution-webcal.spec
Solaris/SUNWevolution.spec
Solaris/Solaris.inc
--- a/Solaris/ChangeLog	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/ChangeLog	Thu Feb 23 17:41:17 2006 +0000
@@ -1,3 +1,12 @@
+2006-02-23 Damien Carbery <[email protected]>
+
+	* Solaris.inc: Define default_category so that it can be added to in
+	the Evolution packages.
+	* SUNWevolution-data-server.spec, SUNWevolution-exchange.spec,
+	SUNWevolution-jescs.spec, SUNWevolution-libs.spec, SUNWevolution.spec,
+	SUNWevolution-webcal.spec: Use default pkg version to match other pkgs;
+	add EVO25 to default category.
+
 2006-02-23 Damien Carbery <[email protected]>
 
 	* make-cinnabar-dist: Remove SUNWacroread from NODIST_PKGS list to fix 
--- a/Solaris/SUNWevolution-data-server.spec	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/SUNWevolution-data-server.spec	Thu Feb 23 17:41:17 2006 +0000
@@ -14,7 +14,8 @@
 
 Name:          SUNWevolution-data-server
 Summary:       Sun Backend Library for Evolution
-Version:       %{eds.version}
+Version:       %{default_pkg_version}
+SUNW_Category: EVO25,%{default_category}
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -134,6 +135,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 - [email protected]
+- Use default pkg version to match other pkgs; add EVO25 to default category.
+
 * Mon Feb 20 2006 - [email protected]
 - Further update of Build/Requires after running check-deps.pl script.
 
--- a/Solaris/SUNWevolution-exchange.spec	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/SUNWevolution-exchange.spec	Thu Feb 23 17:41:17 2006 +0000
@@ -15,7 +15,8 @@
 
 Name:          SUNWevolution-exchange
 Summary:       Exchange Connector for Evolution
-Version:       %{evoexchange.version}
+Version:       %{default_pkg_version}
+SUNW_Category: EVO25,%{default_category}
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -125,6 +126,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 - [email protected]
+- Use default pkg version to match other pkgs; add EVO25 to default category.
+
 * Mon Feb 20 2006 - [email protected]
 - Complete update of Build/Requires after running check-deps.pl script.
 
--- a/Solaris/SUNWevolution-jescs.spec	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/SUNWevolution-jescs.spec	Thu Feb 23 17:41:17 2006 +0000
@@ -13,7 +13,8 @@
 
 Name:          SUNWevolution-jescs
 Summary:       Evolution connector for Sun Java Enterprise System Calendar Server
-Version:       %{evojescs.version}
+Version:       %{default_pkg_version}
+SUNW_Category: EVO25,%{default_category}
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -106,6 +107,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 - [email protected]
+- Use default pkg version to match other pkgs; add EVO25 to default category.
+
 * Mon Feb 20 2006 - [email protected]
 - Update Build/Requires after running check-deps.pl script.
 
--- a/Solaris/SUNWevolution-libs.spec	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/SUNWevolution-libs.spec	Thu Feb 23 17:41:17 2006 +0000
@@ -14,7 +14,8 @@
 
 Name:          SUNWevolution-libs
 Summary:       Evolution Email and Calendar - support libraries
-Version:       2.4.0
+Version:       %{default_pkg_version}
+SUNW_Category: EVO25,%{default_category}
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -123,6 +124,8 @@
 %{_includedir}/*
 
 %changelog
+* Thu Feb 23 2006 - [email protected]
+- Use default pkg version to match other pkgs; add EVO25 to default category.
 * Mon Feb 20 2006 - [email protected]
 - Update Build/Requires after running check-deps.pl script.
 * Fri Sep 09 2005 - <[email protected]>
--- a/Solaris/SUNWevolution-webcal.spec	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/SUNWevolution-webcal.spec	Thu Feb 23 17:41:17 2006 +0000
@@ -13,7 +13,8 @@
 
 Name:          SUNWevolution-webcal
 Summary:       Webcal support for Evolution
-Version:       %{webcal.version}
+Version:       %{default_pkg_version}
+SUNW_Category: EVO25,%{default_category}
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -94,6 +95,9 @@
 %endif
 
 %changelog
+* Thu Feb 23 2006 - [email protected]
+- Use default pkg version to match other pkgs; add EVO25 to default category.
+
 * Mon Feb 20 2006 - [email protected]
 - Complete update of Build/Requires after running check-deps.pl script.
 
--- a/Solaris/SUNWevolution.spec	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/SUNWevolution.spec	Thu Feb 23 17:41:17 2006 +0000
@@ -14,7 +14,8 @@
 
 Name:          SUNWevolution
 Summary:       Evolution Email and Calendar
-Version:       %{evolution.version}
+Version:       %{default_pkg_version}
+SUNW_Category: EVO25,%{default_category}
 SUNW_BaseDir:  %{_basedir}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -223,6 +224,9 @@
 %defattr (0755, root, sys)
 
 %changelog
+* Thu Feb 23 2006 - [email protected]
+- Use default pkg version to match other pkgs; add EVO25 to default category.
+
 * Thu Feb 16 2006 - [email protected]
 - Update Build/Requires after running check-deps.pl script.
 
--- a/Solaris/Solaris.inc	Thu Feb 23 17:40:21 2006 +0000
+++ b/Solaris/Solaris.inc	Thu Feb 23 17:41:17 2006 +0000
@@ -8,12 +8,13 @@
 
 %define default_pkg_version 2.13.92
 %define jds_version JDSosol
+%define default_category   GNOME2,application,%{jds_version}
 %define support_level      unsupported
 %define cc_is_gcc %(test "x`basename $CC`" = xgcc && echo 1 || echo 0)
 %define build_l10n %{?_with_l10n:1}%{?!_with_l10n:0}
 %define debug_build %{?_with_debug:1}%{?!_with_debug:0}
 
-SUNW_Category:             GNOME2,application,%{jds_version}
+SUNW_Category:             %{default_category}
 SUNW_HotLine:              Please contact your local service provider
 SUNW_MaxInst:              1000
 SUNW_Rev:		   10.0.3