OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 04-Jun-2003 11:12:43
Branch: HEAD Handle: 2003060410124002
Modified files:
openpkg-re/vcheck vc.xine-lib
openpkg-src/xine-lib xine-lib.patch xine-lib.spec
openpkg-web news.txt
Log:
use better versioning
Summary:
Revision Changes Path
1.5 +2 -4 openpkg-re/vcheck/vc.xine-lib
1.2 +2 -3 openpkg-src/xine-lib/xine-lib.patch
1.11 +14 -8 openpkg-src/xine-lib/xine-lib.spec
1.4717 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.xine-lib
============================================================================
$ cvs diff -u -r1.4 -r1.5 vc.xine-lib
--- openpkg-re/vcheck/vc.xine-lib 8 May 2003 14:08:19 -0000 1.4
+++ openpkg-re/vcheck/vc.xine-lib 4 Jun 2003 09:12:40 -0000 1.5
@@ -2,10 +2,8 @@
}
prog xine-lib = {
- disabled
- comment = "ms: problems running on FreeBSD, and beta JUNK anyways"
- version = 1-beta11
- url = http://download.sourceforge.net/xine/
+ version = 1-beta12
+ url = http://prdownloads.sourceforge.net/xine/
regex = xine-lib-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xine-lib/xine-lib.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 xine-lib.patch
--- openpkg-src/xine-lib/xine-lib.patch 8 May 2003 14:07:14 -0000 1.1
+++ openpkg-src/xine-lib/xine-lib.patch 4 Jun 2003 09:12:42 -0000 1.2
@@ -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>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xine-lib/xine-lib.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 xine-lib.spec
--- openpkg-src/xine-lib/xine-lib.spec 14 May 2003 09:42:58 -0000 1.10
+++ openpkg-src/xine-lib/xine-lib.spec 4 Jun 2003 09:12:42 -0000 1.11
@@ -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 @@
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 @@
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 @@
$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'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4716 -r1.4717 news.txt
--- openpkg-web/news.txt 4 Jun 2003 09:09:46 -0000 1.4716
+++ openpkg-web/news.txt 4 Jun 2003 09:12:41 -0000 1.4717
@@ -1,3 +1,4 @@
+04-Jun-2003: Upgraded package: P<xine-lib-1.0b12-20030604>
04-Jun-2003: New package: P<distcache-1.4.1-20030604>
04-Jun-2003: Upgraded package: P<docbook-4.2-20030604>
04-Jun-2003: Upgraded package: P<vim-6.2.11-20030604>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
