Author: qboosh Date: Wed Aug 23 18:35:54 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- switched to modular xorg, sorted --with options
---- Files affected:
SPECS:
pike.spec (1.36 -> 1.37)
---- Diffs:
================================================================
Index: SPECS/pike.spec
diff -u SPECS/pike.spec:1.36 SPECS/pike.spec:1.37
--- SPECS/pike.spec:1.36 Tue Aug 8 09:37:12 2006
+++ SPECS/pike.spec Wed Aug 23 20:35:49 2006
@@ -27,9 +27,9 @@
Patch7: %{name}-sparc.patch
URL: http://pike.ida.liu.se/
%{?with_GL:BuildRequires: OpenGL-devel}
+%{?with_GL:BuildRequires: OpenGL-glut-devel}
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
-BuildRequires: XFree86-devel
BuildRequires: autoconf
BuildRequires: bison
BuildRequires: file
@@ -37,7 +37,6 @@
BuildRequires: freetype-devel >= 2.1.0
BuildRequires: gdbm-devel
BuildRequires: glib-devel
-%{?with_GL:BuildRequires: glut-devel}
BuildRequires: gmp-devel
BuildRequires: gtkglarea1-devel
BuildRequires: gtk+-devel
@@ -48,11 +47,12 @@
BuildRequires: nettle-devel
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pdflib-devel
-BuildRequires: perl-base >= 5.6
+BuildRequires: perl-base >= 1:5.6
BuildRequires: postgresql-devel >= 7.2
BuildRequires: postgresql-backend-devel >= 7.2
BuildRequires: sane-backends-devel
BuildRequires: unixODBC-devel
+BuildRequires: xorg-lib-libXext-devel
BuildRequires: zlib-devel
Obsoletes: pike-gmp
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -310,44 +310,42 @@
# workaround - don't try to rebuild other configures
# (or all Makefile.in files must be patched with s/--localdir/-I/)
touch */configure */*/configure */*/*/configure
-LDFLAGS="-L/usr/X11R6/%{_lib} %{rpmldflags}"; export LDFLAGS
CPPFLAGS="-I/usr/include/postgresql/internal -I/usr/include/postgresql/server"
%configure \
--with-double-precision \
+ --with-freetype \
+ --with-gif \
+ --with-gmp \
+ --with-jpeglib \
--with-long-double-precision \
- --with-poll \
--with-max-fd=1024 \
- --with-security \
- --with-gmp \
- --with-zlib \
+ --with-mysql \
--with-pdflib \
+ --with-poll \
--with-postgres \
--with-postgres-include-dir=%{_includedir}/postgresql \
- --with-mysql \
+ --with-sane \
+ --with-security \
+ --with-sybase \
--with-ssleay \
- --with-freetype \
- --with-gif \
- --with-jpeglib \
--with-tifflib \
--with-ttflib \
--with-x \
+ --with-zlib \
%{?with_GL:--with-lib-GL} \
%{?with_GL:--with-GLUT} \
- --with-sane \
--without-perl \
- --without-gnome \
- --with-sybase
+ --without-gnome
-%{__make} || :
+#%{__make} || :
# remake forced by pike?
%{__make} all doc
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}
-cd src
-%{__make} install \
+%{__make} -C src install \
buildroot=$RPM_BUILD_ROOT
rm -f `find $RPM_BUILD_ROOT -regex '.*\.o' -type f | xargs`
@@ -485,6 +483,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37 2006/08/23 18:35:49 qboosh
+- switched to modular xorg, sorted --with options
+
Revision 1.36 2006/08/08 07:37:12 spider
- up to 7.6.86
- http://secunia.com/advisories/20494/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/pike.spec?r1=1.36&r2=1.37&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
