rpms/rdesktop/devel rdesktop.spec, 1.13, 1.14 rdesktop-optflags.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	rdesktop.spec 
Removed Files:
	rdesktop-optflags.patch 
Log Message:
(#152261 thanks jpo)
- Use the %%configure macro (rdesktop now has a real configure file).
- Patch rdesktop-optflags.patch no longer needed.
- Add several missing doc files.



Index: rdesktop.spec
===================================================================
RCS file: /cvs/dist/rpms/rdesktop/devel/rdesktop.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rdesktop.spec	21 Mar 2005 16:55:39 -0000	1.13
+++ rdesktop.spec	27 Mar 2005 00:29:40 -0000	1.14
@@ -1,15 +1,14 @@
-Summary: X client for remote desktop into Windows Terminal Server
-Name: rdesktop
-Version: 1.4.0
-Release: 1
-URL: http://www.rdesktop.org/
-Source0: %{name}-%{version}.tar.gz
-Patch0: %{name}-optflags.patch
-
-License: GPL
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: openssl-devel, xorg-x11-devel
+Name:           rdesktop
+Version:        1.4.0
+Release:        2
+Summary:        X client for remote desktop into Windows Terminal Server
+
+Group:          User Interface/Desktops
+License:        GPL
+URL:            http://www.rdesktop.org/
+Source0:        %{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  openssl-devel, xorg-x11-devel
 
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
@@ -19,29 +18,31 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-# Not autoconf, percentconfigure won't work
-./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
-	--with-openssl=%{_prefix}
-make LDFLAGS="-L/usr/X11R6/%{_lib} -lX11 -lcrypto" %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT%{_prefix} BINDIR=$RPM_BUILD_ROOT%{_bindir} MANDIR=$RPM_BUILD_ROOT%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc COPYING doc/AUTHORS doc/ChangeLog doc/TODO doc/keymapping.txt
+%defattr(-,root,root,-)
+%doc COPYING README doc/{AUTHORS,ChangeLog,HACKING,TODO,*.txt}
 %{_bindir}/rdesktop
-%{_datadir}/rdesktop
+%{_datadir}/rdesktop/
 %{_mandir}/man1/*
 
 %changelog
+* Sat Mar 26 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.4.0-2
+- Use the %%configure macro (rdesktop now has a real configure file).
+- Patch rdesktop-optflags.patch no longer needed.
+- Add several missing doc files.
+
 * 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


--- rdesktop-optflags.patch DELETED ---