Bläddra i källkod

- upgrade to openpkg-tools 0.8.69 (no longer uses "curl -q" in "openpkg build") - fix "openpkg release" with workaround for Solaris sed(1) which ignores lines without trailing newlines

Ralf S. Engelschall 19 år sedan
förälder
incheckning
8ef841e870
3 ändrade filer med 8 tillägg och 5 borttagningar
  1. 3 0
      openpkg/HISTORY
  2. 2 2
      openpkg/openpkg.spec
  3. 3 3
      openpkg/release.sh

+ 3 - 0
openpkg/HISTORY

@@ -2,6 +2,9 @@
 2006
 ====
 
+20060823 upgrade to openpkg-tools 0.8.69 (no longer uses "curl -q" in "openpkg build")
+20060823 fix "openpkg release" with workaround for Solaris sed(1) which ignores lines without trailing newlines
+
 20060818 **** RELEASE AS PART OF OPENPKG 2.20060818 ***
 20060818 upgrade to openpkg-tools 0.8.68
 20060818 try to workaround "grep -e" Autoconf issues on Solaris with OSSP uuid.

+ 2 - 2
openpkg/openpkg.spec

@@ -38,7 +38,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20060818
+%define       V_openpkg  20060823
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -56,7 +56,7 @@
 %define       V_registry 0.7.2
 %define       V_perl     5.8.8
 %define       V_openssl  0.9.8b
-%define       V_tools    0.8.68
+%define       V_tools    0.8.69
 
 #   package information
 Name:         openpkg

+ 3 - 3
openpkg/release.sh

@@ -71,13 +71,13 @@ tag=""
 if [ ".$opt_r" != . ]; then
     tag=`echo ".$opt_r" | sed -e 's;^\.;;' | number_to_tag`
 elif [ -f "$prefix/etc/openpkg/release" ]; then
-    tag=`sed <$prefix/etc/openpkg/release \
+    tag=`(cat $prefix/etc/openpkg/release; echo "") | sed \
         -e 's;^;X;' \
         -e 's;^X *TAG *= *\([^ ][^ ]*\).*;\1;' \
         -e '/^X/d'`
 else
     tag=`$prefix/bin/openpkg rpm \
-        -q --qf '%{VERSION}' openpkg | number_to_tag`
+        -q --qf '%{VERSION}\n' openpkg | number_to_tag`
 fi
 if [ .`echo ".$tag" | sed -e 's;^\.;;' | tag_sanity` = .ERROR ]; then
     echo "openpkg:release: WARNING: unable to determine OpenPKG release tag" 1>&2
@@ -87,7 +87,7 @@ fi
 #   determine distribution URL
 url=""
 if [ -f "$prefix/etc/openpkg/release" ]; then
-    url=`sed <$prefix/etc/openpkg/release \
+    url=`(cat $prefix/etc/openpkg/release; echo "") | sed \
         -e 's;^;X;' \
         -e 's;^X *URL *= *\([^ ][^ ]*\).*;\1;' \
         -e '/^X/d'`