rpms/rdesktop/devel .cvsignore, 1.5, 1.6 rdesktop-optflags.patch, 1.1, 1.2 rdesktop.spec, 1.12, 1.13 sources, 1.5, 1.6 rdesktop-1.3.1-fi-keymap.patch, 1.1, NONE rdesktop-1.3.1-fi-warning.patch, 1.1, NONE rdesktop-1.3.1-xembed.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/rdesktop/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17337

Modified Files:
	.cvsignore rdesktop-optflags.patch rdesktop.spec sources 
Removed Files:
	rdesktop-1.3.1-fi-keymap.patch rdesktop-1.3.1-fi-warning.patch 
	rdesktop-1.3.1-xembed.patch 
Log Message:
* Mon Mar 21 2005 David Zeuthen <davidz at redhat.com> 1.4.0-1
- New upstream version; drop some patches that is now upstream
- Require xorg-x11-devel instead of XFree86-devel for building




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Sep 2004 11:13:14 -0000	1.5
+++ .cvsignore	21 Mar 2005 16:55:39 -0000	1.6
@@ -1 +1,2 @@
 rdesktop-1.3.1.tar.gz
+rdesktop-1.4.0.tar.gz

rdesktop-optflags.patch:
 configure |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: rdesktop-optflags.patch
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rdesktop-optflags.patch	9 Sep 2004 11:13:58 -0000	1.1
+++ rdesktop-optflags.patch	21 Mar 2005 16:55:39 -0000	1.2
@@ -1,11 +1,18 @@
---- configure~	2003-12-11 16:59:54.000000000 +0200
-+++ configure	2004-03-23 19:17:19.000000000 +0200
-@@ -115,7 +115,7 @@
- echo "CC          = $cc" >>Makeconf
- 
- if $cc -v 2>&1 |grep '^gcc' >/dev/null; then
--    cflags="$cflags -Wall -O2"
-+    cflags="$cflags -Wall $RPM_OPT_FLAGS"
+--- configure.orig	2005-03-21 11:29:15.000000000 -0500
++++ configure	2005-03-21 11:30:35.000000000 -0500
+@@ -1980,13 +1980,13 @@
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="-g $RPM_OPT_FLAGS"
+   else
+     CFLAGS="-g"
+   fi
  else
-     cflags="$cflags -O"
- fi
+   if test "$GCC" = yes; then
+-    CFLAGS="-O2"
++    CFLAGS="$RPM_OPT_FLAGS"
+   else
+     CFLAGS=
+   fi


Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rdesktop.spec	2 Mar 2005 18:17:34 -0000	1.12
+++ rdesktop.spec	21 Mar 2005 16:55:39 -0000	1.13
@@ -1,20 +1,15 @@
 Summary: X client for remote desktop into Windows Terminal Server
 Name: rdesktop
-Version: 1.3.1
-Release: 7
+Version: 1.4.0
+Release: 1
 URL: http://www.rdesktop.org/
 Source0: %{name}-%{version}.tar.gz
 Patch0: %{name}-optflags.patch
 
-## CVS backports or stuff that should be in the next version
-Patch100: rdesktop-1.3.1-fi-keymap.patch
-Patch101: rdesktop-1.3.1-fi-warning.patch
-Patch102: rdesktop-1.3.1-xembed.patch
-
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel, XFree86-devel
+BuildRequires: openssl-devel, xorg-x11-devel
 
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
@@ -26,15 +21,10 @@
 %setup -q
 %patch0 -p0
 
-## CVS backports
-%patch100 -p0
-%patch101 -p2
-%patch102 -p0
-
 %build
 # Not autoconf, percentconfigure won't work
 ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
-	--with-openssl
+	--with-openssl=%{_prefix}
 make LDFLAGS="-L/usr/X11R6/%{_lib} -lX11 -lcrypto" %{?_smp_mflags}
 
 %install
@@ -52,6 +42,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar 21 2005 David Zeuthen <davidz at redhat.com> 1.4.0-1
+- New upstream version; drop some patches that is now upstream
+- Require xorg-x11-devel instead of XFree86-devel for building
+
 * Wed Mar  2 2005 Mark McLoughlin <markmc at redhat.com> 1.3.1-7
 - Rebuild with gcc4
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Sep 2004 11:13:14 -0000	1.5
+++ sources	21 Mar 2005 16:55:39 -0000	1.6
@@ -1 +1 @@
-968a1e3f5161bab80c306df31c54cfb1  rdesktop-1.3.1.tar.gz
+542cb9d9b4dd1ecaf3ed4ff753fea7b8  rdesktop-1.4.0.tar.gz


--- rdesktop-1.3.1-fi-keymap.patch DELETED ---


--- rdesktop-1.3.1-fi-warning.patch DELETED ---


--- rdesktop-1.3.1-xembed.patch DELETED ---