upgrading package: styx 1.5 -> 1.7

styx/styx.spec

@@ -32,11 +32,11 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Compiler
 License:      GPL
-Version:      1.5
-Release:      20040207
+Version:      1.7
+Release:      20051111
 
 #   list of sources
-Source0:      http://www.speculate.de/styx/styx-%{version}.tgz
+Source0:      http://speculate.de/styx/styx-%{version}.tar.gz
 Patch0:       styx.patch
 
 #   build information
@@ -62,8 +62,8 @@ AutoReqProv:  no
 %track
     prog styx = {
         version   = %{version}
-        url       = http://www.speculate.de/styx/
-        regex     = styx-(__VER__)\.tgz
+        url       = http://speculate.de/styx/en/download.html
+        regex     = styx-(__VER__)\.tar\.gz
     }
 
 %prep
@@ -81,6 +81,7 @@ AutoReqProv:  no
     LIBS="-liconv" \
     ./configure \
         --prefix=%{l_prefix} \
+        --datadir=%{l_prefix}/share/styx \
         --disable-shared
     %{l_make} %{l_mflags}
 
@@ -88,14 +89,12 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install \
         prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+        exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
+        datadir=$RPM_BUILD_ROOT%{l_prefix}/share/styx
     mkdir $RPM_BUILD_ROOT%{l_prefix}/include/styx
     mv $RPM_BUILD_ROOT%{l_prefix}/include/*.h \
        $RPM_BUILD_ROOT%{l_prefix}/include/styx/
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/tutorial
-    mkdir $RPM_BUILD_ROOT%{l_prefix}/share
-    mv $RPM_BUILD_ROOT%{l_prefix}/doc \
-       $RPM_BUILD_ROOT%{l_prefix}/share/styx
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}