Explorar el Código

use better versioning

Ralf S. Engelschall hace 22 años
padre
commit
8e6a623d5d
Se han modificado 2 ficheros con 16 adiciones y 11 borrados
  1. 2 3
      xine-lib/xine-lib.patch
  2. 14 8
      xine-lib/xine-lib.spec

+ 2 - 3
xine-lib/xine-lib.patch

@@ -1,6 +1,5 @@
-diff -Naur xine-lib-1-beta11.orig/src/video_out/video_out_sdl.c xine-lib-1-beta11/src/video_out/video_out_sdl.c
---- xine-lib-1-beta11.orig/src/video_out/video_out_sdl.c	2003-02-14 15:47:37.000000000 +0100
-+++ xine-lib-1-beta11/src/video_out/video_out_sdl.c	2003-05-08 14:28:24.000000000 +0200
+--- src/video_out/video_out_sdl.c	2003-02-14 15:47:37.000000000 +0100
++++ src/video_out/video_out_sdl.c	2003-05-08 14:28:24.000000000 +0200
 @@ -48,7 +48,7 @@
  #include <inttypes.h>
  #include <math.h>

+ 14 - 8
xine-lib/xine-lib.spec

@@ -23,8 +23,12 @@
 ##  SUCH DAMAGE.
 ##
 
-#   ms: JUNK because of core dumps on FreeBSD. The real problem might be the
-#       package xine-ui instead, but I'm not sure.
+#   FIXME: ms: JUNK because of core dumps on FreeBSD. The real problem might be the..
+#   FIXME: ms: ...package xine-ui instead, but I'm not sure.
+
+#   package version
+%define       V_dist   1-beta12
+%define       V_opkg   1.0b12
 
 #   package information
 Name:         xine-lib
@@ -35,11 +39,11 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [JUNK]
 Group:        Video
 License:      GPL
-Version:      1
-Release:      20030514
+Version:      %{V_opkg}
+Release:      20030604
 
 #   list of sources
-Source0:      http://download.sourceforge.net/xine/xine-lib-%{version}-beta12.tar.gz
+Source0:      http://download.sourceforge.net/xine/xine-lib-%{V_dist}.tar.gz
 Patch0:       xine-lib.patch
 
 #   build information
@@ -59,8 +63,8 @@ AutoReqProv:  no
     uncommon formats, too.
 
 %prep
-    %setup -q -n xine-lib-1-beta12
-    %patch -p1
+    %setup -q -n xine-lib-%{V_dist}
+    %patch -p0
 
 %build
     CC="%{l_cc}" \
@@ -95,7 +99,9 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/aclocal \
         $RPM_BUILD_ROOT%{l_prefix}/share/doc \
         $RPM_BUILD_ROOT%{l_prefix}/share/locale
-    %{l_shtool} subst -e 's;\(\)libxine\.so[\ \.0-9]*\(\);\1\2;g' $RPM_BUILD_ROOT%{l_prefix}/lib/libxine.la
+    %{l_shtool} subst \
+        -e 's;\(\)libxine\.so[\ \.0-9]*\(\);\1\2;g' \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/libxine.la
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%not %dir %{l_prefix}/lib/pkgconfig'