rpms/wmacpi/EL-4 wmacpi.spec,1.2,1.3

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/wmacpi/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12892

Modified Files:
	wmacpi.spec 
Log Message:
monolithic xorg


Index: wmacpi.spec
===================================================================
RCS file: /cvs/extras/rpms/wmacpi/EL-4/wmacpi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wmacpi.spec	28 May 2008 08:02:52 -0000	1.2
+++ wmacpi.spec	28 May 2008 08:12:30 -0000	1.3
@@ -9,9 +9,7 @@
 Source0:        http://himi.org/wmacpi/download/wmacpi-2.2rc1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libX11-devel
-BuildRequires:  libXext-devel
-BuildRequires:  libXpm-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  libdockapp-devel
 
 %description
@@ -29,8 +27,8 @@
 
 %build
 # -lXpm -lXext are not directly needed, only through libdockapp
-make CFLAGS="$RPM_OPT_FLAGS -ansi" \
-LDFLAGS="$RPM_OPT_FLAGS -lX11 -ldockapp" \
+make CFLAGS="$RPM_OPT_FLAGS -ansi -I%{_prefix}/X11R6/include" \
+LDFLAGS="$RPM_OPT_FLAGS -L%{_prefix}/X11R6/%{_lib} -lX11 -ldockapp" \
 %{?_smp_mflags}
 
 
@@ -73,10 +71,6 @@
 1.34-6
 - Rebuild for Fedora Extras 5
 
-* Fri Nov 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.34-5
-- modular xorg integration
-
 * Sat Aug 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.34-4
 - better description