--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgbuild/patches/ips-facets.patch Sat Jun 25 23:17:31 2011 +0100
@@ -0,0 +1,14 @@
+diff -r ca2800bed7ba pkgbuild.pl.in
+--- a/pkgbuild.pl.in Fri Nov 19 10:00:50 2010 +1100
++++ b/pkgbuild.pl.in Fri Nov 19 10:03:20 2010 +1100
+@@ -2130,8 +2130,8 @@
+ my $tag = shift;
+
+ if (defined $tag) {
+- if ($tag =~ /(devel|doc|l10n)/) {
+- $tag = " $tag=true";
++ if ($tag =~ /(devel|doc)/) {
++ $tag = " facet.$tag=true";
+ } else {
+ $tag = "";
+ }
--- a/pkgbuild/pkgbuild.spec Sat Jun 25 21:27:50 2011 +0100
+++ b/pkgbuild/pkgbuild.spec Sat Jun 25 23:17:31 2011 +0100
@@ -22,7 +22,7 @@
Group: Development/Tools
URL: http://pkgbuild.sourceforge.net/
Version: 1.3.103
-Release: 2
+Release: 1
BuildArch: noarch
Vendor: OpenSolaris Community
Summary: rpmbuild-like tool for building Solaris packages
@@ -38,8 +38,10 @@
#Patch2: pkgbuild/pkgbuild-postprocess-debug-separate.diff
#Patch3: pkgbuild/pkgbuild-local.diff
Patch5: pkgbuild/pkgbuild-05-xz.diff
-Patch6: pkgbuild/distro-redefine-tags.diff
-Patch7: pkgbuild/no-source-packages.diff
+# Next patch taken from http://sourceforge.net/tracker/index.php?func=detail&aid=3166269&group_id=125443&atid=702474
+Patch6: pkgbuild/ips-facets.patch
+Patch7: pkgbuild/distro-redefine-tags.diff
+Patch8: pkgbuild/no-source-packages.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %_is_pkgbuild
@@ -84,9 +86,10 @@
# patch to make pkgbuild recognize xz compressed archives
%patch5
%patch6 -p1
+%patch7 -p1
# stop pkgtool from building source packages
# Originally, pkgtool called pkgbuild with -bb, not -ba. Really, an option controlling this should be added.
-%patch7 -p1
+%patch8 -p1
%build
./configure --prefix=%{pkgbuild_prefix} --docdir=%_docdir/%srcname
@@ -111,6 +114,8 @@
%{_mandir}
%changelog
+* Sat Jun 25 2011 - Alex Viskovatoff <[email protected]>
+- set facet.<name> tag correctly
* Wed Jun 22 2011 - Alex Viskovatoff <[email protected]>
- get ips_package_name from packages.xml
- stop pkgtool from building source packages