rpms/synergy/devel synergy.spec,1.15,1.16

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/synergy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14519

Modified Files:
	synergy.spec 
Log Message:
Minor cleanups.



Index: synergy.spec
===================================================================
RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- synergy.spec	28 Aug 2006 12:28:51 -0000	1.15
+++ synergy.spec	19 Jun 2007 18:31:03 -0000	1.16
@@ -1,21 +1,17 @@
 Summary: Mouse and keyboard sharing utility
 Name: synergy
 Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://synergy2.sourceforge.net/
 Source: http://dl.sf.net/synergy2/synergy-%{version}.tar.gz
 Patch: synergy-1.2.2-werror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, automake
-# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 5
 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel
 BuildRequires: libXinerama-devel
-%else
-BuildRequires: xorg-x11-devel
-%endif
+# Required by autoreconf
+BuildRequires: autoconf, automake
 
 %description
 Synergy lets you easily share a single mouse and keyboard between
@@ -26,7 +22,7 @@
 
 
 %prep
-%setup
+%setup -q
 %patch -p1 -b .werror
 autoreconf
 
@@ -38,7 +34,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 
 
 %clean
@@ -46,7 +42,7 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING doc/PORTING NEWS README
 %doc doc/*.css doc/*.html
 %doc examples/synergy.conf
@@ -55,6 +51,10 @@
 
 
 %changelog
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-3
+- Change to using the DESTDIR install mathod.
+- Drop X build requires conditional.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.1-2
 - FC6 rebuild.