upgrading package: ustl 1.2 -> 1.3

ustl/ustl.patch

@@ -1,24 +1,48 @@
-Index: bsconf.c
---- bsconf.c.orig	2007-09-02 21:49:02 +0200
-+++ bsconf.c	2007-09-03 09:20:00 +0200
-@@ -780,6 +780,7 @@
- 	Substitute ("-Winline", "-Wno-inline");
-     }
+Index: Config.mk.in
+--- Config.mk.in.orig	2009-08-04 19:21:43 +0200
++++ Config.mk.in	2010-01-11 20:42:57 +0100
+@@ -18,7 +18,7 @@
+ DOXYGEN		:= @DOXYGEN@
+ INSTALL		:= @INSTALL@
  
-+#if 0
-     if ((g_SysType == sys_Linux) | (g_SysType == sys_Bsd))
- 	Substitute ("@SHBLDFL@", "-shared -Wl,-soname=${LIBSOLNK}");
-     else if (g_SysType == sys_Mac)
-@@ -787,9 +788,12 @@
-     else if (g_SysType == sys_Sun)
- 	Substitute ("@SHBLDFL@", "-G");
-     else {
-+#endif
- 	Substitute ("BUILD_SHARED\t= 1 ", "#BUILD_SHARED\t= 1");
- 	Substitute ("#BUILD_STATIC\t= 1", "BUILD_STATIC\t= 1 ");
-+#if 0
-     }
-+#endif
+-INSTALLDATA	:= ${INSTALL} -D -p -m 644
++INSTALLDATA	:= ${INSTALL} -c -m 644
+ INSTALLLIB	:= ${INSTALLDATA}
  
-     if (g_SysType == sys_Mac) {
- 	Substitute (" @libgcc_eh@", "");
+ ################ Destination #########################################
+Index: configure
+--- configure.orig	2009-08-04 19:21:43 +0200
++++ configure	2010-01-11 20:42:39 +0100
+@@ -307,8 +307,8 @@
+     local cc=$COMPONENTS
+     echo "Options:"
+     while [ ! -z "$cc" ]; do
+-	local name=`expr "$cc" : '[^}]*name=\[\([^]]*\)\]'`
+-	local desc=`expr "$cc" : '[^}]*desc=\[\([^]]*\)\]'`
++	local name=`expr "x$cc" : '[^}]*name=\[\([^]]*\)\]'`
++	local desc=`expr "x$cc" : '[^}]*desc=\[\([^]]*\)\]'`
+ 	echo "  --$name	$desc"
+ 	cc=`expr "$cc" : '[^}]*}\(.*\)'`
+     done
+@@ -362,8 +362,8 @@
+ SubComp() {
+     local cc=$COMPONENTS
+     while [ ! -z "$cc" ]; do
+-	local name=`expr "$cc" : '[^}]*name=\[\([^]]*\)\]'`
+-	local seds=`expr "$cc" : '[^}]*seds=\[\([^]]*\)\]'`
++	local name=`expr "x$cc" : '[^}]*name=\[\([^]]*\)\]'`
++	local seds=`expr "x$cc" : '[^}]*seds=\[\([^]]*\)\]'`
+ 	[ "$name" = "$1" ] && echo -e $seds >>config.sed
+ 	cc=`expr "$cc" : '[^}]*}\(.*\)'`
+     done
+@@ -374,8 +374,8 @@
+ 	--)		break;;
+ 	--version |-V)	PrintVersion && die;;
+ 	--help |-h |-?)	PrintHelp && die;;
+-	--*=*)		SubVar `expr "$i" : '--\([^=]*\)='` `expr "$i" : '[^=]*=\(.*\)'`;;
+-	--*)		SubComp `expr "$i" : '--\(.*\)'`;;
++	--*=*)		SubVar `expr "x$i" : 'x--\([^=]*\)='` `expr "$i" : '[^=]*=\(.*\)'`;;
++	--*)		SubComp `expr "x$i" : 'x--\(.*\)'`;;
+ 	*)		echo "Error: unrecognized option \"$i\"" && die;;
+     esac
+ done

ustl/ustl.spec

@@ -31,12 +31,11 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Language
 License:      MIT
-Version:      1.2
-Release:      20090327
+Version:      1.3
+Release:      20100111
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/ustl/ustl-%{version}.tar.bz2
-Source1:      http://switch.dl.sourceforge.net/ustl/ustl-docs-%{version}.tar.bz2
 Patch0:       ustl.patch
 
 #   build information
@@ -61,7 +60,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %setup -q -T -D -b 1
     %patch -p0
 
 %build
@@ -69,12 +67,18 @@ AutoReqProv:  no
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O}" \
-    ./configure \
-        --prefix=%{l_prefix}
-    %{l_make} %{l_mflags -O}
+    %{l_bash} ./configure \
+        --prefix=%{l_prefix} \
+        --with-static \
+        --without-shared
+    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
+        $RPM_BUILD_ROOT%{l_prefix}/include/ustl \
+        $RPM_BUILD_ROOT%{l_prefix}/lib
     %{l_make} %{l_mflags} install \
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \