SPECS: gnurobbo.spec - dropped /usr/X11R6, cleanup

qboosh qboosh at pld-linux.org
Tue Oct 17 00:14:25 CEST 2006


Author: qboosh                       Date: Mon Oct 16 22:14:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped /usr/X11R6, cleanup

---- Files affected:
SPECS:
   gnurobbo.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/gnurobbo.spec
diff -u SPECS/gnurobbo.spec:1.17 SPECS/gnurobbo.spec:1.18
--- SPECS/gnurobbo.spec:1.17	Wed Jul 26 18:03:33 2006
+++ SPECS/gnurobbo.spec	Tue Oct 17 00:14:19 2006
@@ -13,7 +13,7 @@
 Patch0:		%{name}-stdlib.patch
 URL:		http://gnurobbo.sourceforge.net/
 BuildRequires:	SDL_ttf-devel
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,22 +31,18 @@
 #%setup -q
 # blegh, tarball contains icons in /... don't mess in %_builddir
 %setup -q -c
-%patch0 -p 1
-
-# workaround for bad timestamps on files in source tarball
-#find . -type f | xargs touch
+%patch0 -p1
 
 %build
 cd %{name}-%{version}
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-cp config.h{,.in}
+#cp config.h{,.in}
+%{__autoheader}
 %{__automake}
 %configure \
-	CPPFLAGS="-I/usr/X11R6/include" \
-	LDFLAGS="%{rpmldflags} -L/usr/X11R6/lib"
+	LDFLAGS="%{rpmldflags}"
 
 %{__make}
 
@@ -54,8 +50,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-cd %{name}-%{version}
-%{__make} install \
+%{__make} -C %{name}-%{version} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -78,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/10/16 22:14:19  qboosh
+- dropped /usr/X11R6, cleanup
+
 Revision 1.17  2006/07/26 16:03:33  glen
 - unify sourceforge url
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnurobbo.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list