OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 31-Jan-2003 10:13:48
Branch: HEAD Handle: 2003013109134601
Modified files:
openpkg-re/vcheck vc.rdesktop
openpkg-src/rdesktop rdesktop.spec
openpkg-web news.txt
Removed files:
openpkg-src/rdesktop rdesktop.patch
Log:
upgrade from 1.1.0 to 1.2.0
Summary:
Revision Changes Path
1.5 +1 -7 openpkg-re/vcheck/vc.rdesktop
1.2 +0 -54 openpkg-src/rdesktop/rdesktop.patch
1.16 +6 -16 openpkg-src/rdesktop/rdesktop.spec
1.3118 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.rdesktop
============================================================================
$ cvs diff -u -r1.4 -r1.5 vc.rdesktop
--- openpkg-re/vcheck/vc.rdesktop 26 Nov 2002 18:34:26 -0000 1.4
+++ openpkg-re/vcheck/vc.rdesktop 31 Jan 2003 09:13:46 -0000 1.5
@@ -2,14 +2,8 @@
}
prog rdesktop = {
- comment = "rse: wait for release version"
- version = 1.1.0
+ version = 1.2.0
url = http://prdownloads.sourceforge.net/rdesktop/
regex = rdesktop-(__VER__)\.tar\.gz
-}
-prog rdesktop:patchset = {
- version = 19-9-0
- url = http://bibl4.oru.se/projects/rdesktop/
- regex = rdesktop-unified-patch(__VER__)\.bz2
}
@@ .
rm -f openpkg-src/rdesktop/rdesktop.patch <<'@@ .'
Index: openpkg-src/rdesktop/rdesktop.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rdesktop/rdesktop.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 rdesktop.spec
--- openpkg-src/rdesktop/rdesktop.spec 15 Jan 2003 08:18:15 -0000 1.15
+++ openpkg-src/rdesktop/rdesktop.spec 31 Jan 2003 09:13:47 -0000 1.16
@@ -23,9 +23,7 @@
## SUCH DAMAGE.
##
-%define V_major 1.1.0
-%define V_patch_here 19.9.0
-%define V_patch_real 19-9-0
+%define V_major 1.2.0
# package information
Name: rdesktop
@@ -36,13 +34,11 @@
Distribution: OpenPKG [PLUS]
Group: Terminal
License: GPL
-Version: %{V_major}.%{V_patch_here}
-Release: 20030115
+Version: %{V_major}
+Release: 20030131
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/rdesktop/rdesktop-%{V_major}.tar.gz
-Patch0:
http://bibl4.oru.se/projects/rdesktop/rdesktop-unified-patch%{V_patch_real}.bz2
-Patch1: rdesktop.patch
# build information
Prefix: %{l_prefix}
@@ -60,19 +56,13 @@
%prep
%setup -q -n rdesktop-%{V_major}
- %patch0 -p2
- %patch1 -p0
%build
./configure \
--prefix=$RPM_BUILD_ROOT%{l_prefix} \
--with-openssl=%{l_prefix} \
- --with-ssl-includes=%{l_prefix}/include/openssl \
- --with-ssl-libs=%{l_prefix}/lib \
- --with-gui=xwin \
- --with-gui-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
- --with-gui-libs=`%{l_prefix}/etc/rc --query x11_libdir`
- %{l_make} %{l_mflags} all \
+ --with-x=`%{l_prefix}/etc/rc --query x11_libdir`/..
+ %{l_make} %{l_mflags} \
CC="%{l_cc} %{l_cflags -O} %{l_cppflags}"
%install
@@ -83,7 +73,7 @@
%{l_shtool} install -c -s -m 755 \
rdesktop $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -m 644 \
- rdesktop.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ doc/rdesktop.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3117 -r1.3118 news.txt
--- openpkg-web/news.txt 31 Jan 2003 07:38:52 -0000 1.3117
+++ openpkg-web/news.txt 31 Jan 2003 09:13:46 -0000 1.3118
@@ -1,3 +1,4 @@
+31-Jan-2003: Upgraded package: P<rdesktop-1.2.0-20030131>
31-Jan-2003: Upgraded package: P<vim-6.1.312-20030131>
31-Jan-2003: Upgraded package: P<perl-ssl-20030131-20030131>
31-Jan-2003: Upgraded package: P<dialog-0.9b.20030130-20030131>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
