[Pkgbuild-sfe-commits] SF.net SVN: pkgbuild:[4756] spec-files-extra/trunk

[<log...@us...>]

Revision: 4756
          http://pkgbuild.svn.sourceforge.net/pkgbuild/?rev=4756&view=rev
Author:   loganbruns
Date:     2012-06-24 20:41:07 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
SFExmlto.spec: add pnm_requires_data_docbook defines to switch between OI and S11 variants.

Modified Paths:
--------------
    spec-files-extra/trunk/ChangeLog
    spec-files-extra/trunk/SFExmlto.spec
    spec-files-extra/trunk/include/packagenames.define.allbuilds.inc

Modified: spec-files-extra/trunk/ChangeLog
===================================================================
--- spec-files-extra/trunk/ChangeLog	2012-06-24 12:19:33 UTC (rev 4755)
+++ spec-files-extra/trunk/ChangeLog	2012-06-24 20:41:07 UTC (rev 4756)
@@ -1,5 +1,9 @@
 2012-06-24  Logan O'Sullivan Bruns  <lo...@ge...>
 
+	* SFExmlto.spec: add pnm_requires_data_docbook defines to switch
+	between OI and S11 variants.
+	* include/packagenames.define.allbuilds.inc
+
 	* experimental/SFEhive.spec: initial spec.
 	* copyright/SFEhive.copyright
 	* ext-sources/hive.xml

Modified: spec-files-extra/trunk/SFExmlto.spec
===================================================================
--- spec-files-extra/trunk/SFExmlto.spec	2012-06-24 12:19:33 UTC (rev 4755)
+++ spec-files-extra/trunk/SFExmlto.spec	2012-06-24 20:41:07 UTC (rev 4756)
@@ -4,6 +4,7 @@
 # includes module(s): xmlto
 #
 %include Solaris.inc
+%include packagenamemacros.inc
 
 Name:                    SFExmlto
 IPS_Package_Name:	 developer/documentation-tool/xmlto
@@ -20,7 +21,7 @@
 %include default-depend.inc
 Requires: SUNWlxsl
 Requires: SUNWlxml
-Requires: data/docbook/docbook-style-xsl
+Requires: %pnm_requires_data_docbook
 Requires: SUNWw3m
 Requires: SFEgnugetopt
 
@@ -63,6 +64,8 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jun 24 2012 - Logan Bruns <lo...@ge...>
+- add pnm_requires_data_docbook defines to switch between OI and S11 variants
 * Sat Jun 23 2012 - Logan Bruns <lo...@ge...>
 - replaced requires SUNWgnome-xml-* with requires
   data/docbook/docbook-style-xsl to make s11 happy.

Modified: spec-files-extra/trunk/include/packagenames.define.allbuilds.inc
===================================================================
--- spec-files-extra/trunk/include/packagenames.define.allbuilds.inc	2012-06-24 12:19:33 UTC (rev 4755)
+++ spec-files-extra/trunk/include/packagenames.define.allbuilds.inc	2012-06-24 20:41:07 UTC (rev 4756)
@@ -843,6 +843,8 @@
 %define pnm_buildrequires_SUNWlibC_devel		system/library/c++/sunpro
 %define pnm_buildrequires_SUNWlibC			system/library/c++/sunpro
 %define pnm_requires_SUNWlibC				system/library/c++/sunpro
+%define pnm_buildrequires_data_docbook          data/docbook
+%define pnm_requires_data_docbook               data/docbook
 %endif
 #END >= 151
 %endif
@@ -896,6 +898,9 @@
 %define pnm_buildrequires_SUNWlibfuse				library/libfuse
 %define pnm_requires_SUNWlibfuse				library/libfuse
 
+%define pnm_buildrequires_data_docbook          data/docbook/docbook-style-xsl
+%define pnm_requires_data_docbook               data/docbook/docbook-style-xsl
+
 %endif
 #END >=163
 %endif
@@ -1329,6 +1334,8 @@
 # 
 
 %changelog
+* Sun Jun 24 2012 - Logan Bruns <lo...@ge...>
+- add pnm_requires_data_docbook defines to switch between OI and S11 variants
 * Sat Jun 23 2012 - Thomas Wagner
 - handle SUNWlibC: system/library/c++-runtime is renamed on OI to 
   system/library/c++/sunpro (OI>=151), S11 unchanged

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.