rpms/libvisual-plugins/devel libvisual-plugins-0.2.0-configure.patch, NONE, 1.1 libvisual-plugins.spec, 1.5, 1.6

[Michael A. Peters (mpeters)]

Author: mpeters

Update of /cvs/extras/rpms/libvisual-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28599

Modified Files:
	libvisual-plugins.spec 
Added Files:
	libvisual-plugins-0.2.0-configure.patch 
Log Message:
Fixed detection of the xinclude and xlibrary dirs - since they now can
be found in /usr/include and /usr/lib - $x_libraries and $x_libraries
were empty - but later asked for in a way that did not allow them to be
empty.


libvisual-plugins-0.2.0-configure.patch:

--- NEW FILE libvisual-plugins-0.2.0-configure.patch ---
diff -uNr libvisual-plugins-0.2.0.orig/configure libvisual-plugins-0.2.0/configure
--- libvisual-plugins-0.2.0.orig/configure	2005-01-24 15:43:45.000000000 +0100
+++ libvisual-plugins-0.2.0/configure	2005-02-16 21:56:05.875203208 +0100
@@ -20027,8 +20027,6 @@
 opengl=no
 if test x$have_x = xyes ; then
 
-    LDFLAGS="$LDFLAGS -Wl,-rpath,$x_libraries -L$x_libraries"
-    CPPFLAGS="$CPPFLAGS -I$x_includes"
 
 
 


Index: libvisual-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/libvisual-plugins/devel/libvisual-plugins.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libvisual-plugins.spec	20 Nov 2005 10:50:07 -0000	1.5
+++ libvisual-plugins.spec	20 Nov 2005 21:32:26 -0000	1.6
@@ -8,6 +8,7 @@
 URL:            http://libvisual.sourceforge.net/v2/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/libvisual/%{name}-%{version}.tar.gz
 Patch0:         libvisual-plugins-0.2.0.mkinstalldirs.patch
+Patch1:         libvisual-plugins-0.2.0-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libvisual-devel >= 0.2.0
@@ -29,9 +30,7 @@
 %prep
 %setup -q
 %patch0 -p1
-# remove rpath from configure - the directory it
-# adds is part of /etc/ld.so.conf.d/xorg-x11-$ARCH.conf
-%{__sed} -i 's?$LDFLAGS -Wl,-rpath,$x_libraries ?$LDFLAGS -Wl,?' configure
+%patch1 -p1
 
 
 %build
@@ -40,8 +39,6 @@
 %endif
 
 %configure \
---x-includes=/usr/X11R6/include/ \
---x-libraries=/usr/X11R6/lib/ \
 --enable-extra-optimization \
 --disable-infinite \
 --disable-flower \
@@ -79,8 +76,13 @@
 %_datadir/libvisual-plugins/
 
 %changelog
+* Sun Nov 20 2005 Michael A. Peters <mpeters at mac.com> - 0.2.0-2
+- configure patch (patch1) to fix detection of xlibraries/xincludes
+- removed sed line fix of rpath in %%prep - no longer needed with
+- the configure patch
+
 * Sun Nov 20 2005 Michael A. Peters <mpeters at mac.com> - 0.2.0-1.9
-- fixed it so it builds (specified x-includedir)
+- fixed it so it builds (specified x-libraries)
 - building OpenGL plugin
 
 * Sat Nov 19 2005 Michael A. Peters <mpeters at mac.com> - 0.2.0-1.3