2004-04-02 Laszlo Peter <[email protected]>
authorlaca
Fri, 02 Apr 2004 05:00:29 +0000
changeset 2367 de6c80fb02b4
parent 2366 0cfa3920b136
child 2368 fa1ca4edc1da
2004-04-02 Laszlo Peter <[email protected]> * extra-specs/docbook-dsssl-stylesheets-1.77.spec: don't remove $RPM_BUILD_ROOT in %install * extra-specs/docbook-xsl-stylesheets-1.60.1.spec: don't remove $RPM_BUILD_ROOT in %install
Solaris/ChangeLog
Solaris/build-gnome2.pl
Solaris/extra-specs/docbook-dsssl-stylesheets-1.77.spec
Solaris/extra-specs/docbook-xsl-stylesheets-1.60.1.spec
--- a/Solaris/ChangeLog	Fri Apr 02 02:29:03 2004 +0000
+++ b/Solaris/ChangeLog	Fri Apr 02 05:00:29 2004 +0000
@@ -1,3 +1,11 @@
+2004-04-02  Laszlo Peter  <[email protected]>
+
+	* extra-specs/docbook-dsssl-stylesheets-1.77.spec: don't remove
+	  $RPM_BUILD_ROOT in %install
+
+	* extra-specs/docbook-xsl-stylesheets-1.60.1.spec: don't remove
+	  $RPM_BUILD_ROOT in %install
+
 2004-04-01  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-img-editor.spec:  Added.
--- a/Solaris/build-gnome2.pl	Fri Apr 02 02:29:03 2004 +0000
+++ b/Solaris/build-gnome2.pl	Fri Apr 02 05:00:29 2004 +0000
@@ -430,6 +430,8 @@
     my $retval = shift;
     if (not defined ($retval)) {
 	$retval = 0;
+    } elsif ($retval eq "help" or $retval eq "h") {
+	$retval = 0;
     }
     
     print << "EOF";
--- a/Solaris/extra-specs/docbook-dsssl-stylesheets-1.77.spec	Fri Apr 02 02:29:03 2004 +0000
+++ b/Solaris/extra-specs/docbook-dsssl-stylesheets-1.77.spec	Fri Apr 02 05:00:29 2004 +0000
@@ -66,10 +66,10 @@
 
 %install
 export RPM_BUILD_ROOT
-if [ ! "x" = "x$RPM_BUILD_ROOT" ]; then
-  rm -fr $RPM_BUILD_ROOT
-  %{INSTALL_DIR} $RPM_BUILD_ROOT
-fi
+#if [ ! "x" = "x$RPM_BUILD_ROOT" ]; then
+#  rm -fr $RPM_BUILD_ROOT
+#  %{INSTALL_DIR} $RPM_BUILD_ROOT
+#fi
 doc_dir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 sgml_dir=$RPM_BUILD_ROOT%{_datadir}/sgml
 sgml_dir_db=$RPM_BUILD_ROOT%{_datadir}/sgml/docbook
--- a/Solaris/extra-specs/docbook-xsl-stylesheets-1.60.1.spec	Fri Apr 02 02:29:03 2004 +0000
+++ b/Solaris/extra-specs/docbook-xsl-stylesheets-1.60.1.spec	Fri Apr 02 05:00:29 2004 +0000
@@ -59,10 +59,10 @@
 
 %install
 export RPM_BUILD_ROOT
-if [ ! "x" = "x$RPM_BUILD_ROOT" ]; then
-  rm -fr $RPM_BUILD_ROOT
-  %{INSTALL_DIR} $RPM_BUILD_ROOT
-fi
+#if [ ! "x" = "x$RPM_BUILD_ROOT" ]; then
+#  rm -fr $RPM_BUILD_ROOT
+#  %{INSTALL_DIR} $RPM_BUILD_ROOT
+#fi
 doc_dir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 %define sgml_dir %{_datadir}/sgml
 %define sgml_dir_docbook %{sgml_dir}/docbook