rpms/linuxwacom/devel linuxwacom.spec,1.46,1.47

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25430

Modified Files:
	linuxwacom.spec 
Log Message:
weird creepy amd64 fix


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- linuxwacom.spec	14 Nov 2007 19:01:56 -0000	1.46
+++ linuxwacom.spec	14 Nov 2007 19:30:12 -0000	1.47
@@ -1,5 +1,3 @@
-%define _x11dir		/usr
-%define _x11libdir	%{_x11dir}/%{_lib}
 %define _x11sdkdir	%(pkg-config --variable=sdkdir xorg-server)
 %define tarname		%{name}-0.7.8-3
 
@@ -62,7 +60,7 @@
 export RPM_LIBDIR=%{_lib}
 %configure --without-gtk --without-tcl --without-tk \
 	--disable-wacomxi --disable-libwacomxi \
-	--with-xorg-sdk=/usr --with-xlib=%{_x11libdir} \
+	--with-xorg-sdk=/usr --with-xlib=%{_libdir} \
 	--enable-dlloader $XSERVER64
 
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -75,20 +73,25 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-wacom.rules
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+# This is terribly wrong but I can't be bothered to figure it out right now.
+%ifarch x86_64
+if [ -e $RPM_BUILD_ROOT/wacom_drv.so ]; then
+    install -m 755 -d $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/input
+    mv $RPM_BUILD_ROOT/wacom_drv.so $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/input
+fi
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files 
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README NEWS
-%attr(0444,root,root) %{_x11libdir}/xorg/modules/input/wacom_drv.so
+%attr(0444,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
 %{_bindir}/wacdump
 %{_bindir}/xidump
 %{_bindir}/xsetwacom