Revision: 48592
Author: river
Date: 2009-03-19 19:07:28 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
TSpcre: update to current build system
Modified Paths:
--------------
trunk/tools/ts-specs/TSpcre.spec
trunk/tools/ts-specs/base-specs/pcre.spec
Modified: trunk/tools/ts-specs/TSpcre.spec
===================================================================
--- trunk/tools/ts-specs/TSpcre.spec 2009-03-19 19:04:36 UTC (rev 48591)
+++ trunk/tools/ts-specs/TSpcre.spec 2009-03-19 19:07:28 UTC (rev 48592)
@@ -1,27 +1,16 @@
%include Solaris.inc
-%ifarch amd64 sparcv9
%include arch64.inc
%use pcre_64 = pcre.spec
-%endif
-
%include base.inc
%use pcre = pcre.spec
-%define src_name pcre
-%define src_version 7.8
-%define pkg_release 1
-
+Name: %{pcre.name}
+Summary: PCRE - Perl Compatible Regular Expressions
+Version: %{pcre.version}
+Source: %{sf_download}/pcre/pcre-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
-
-Name: TS%{src_name}
-Summary: PCRE - Perl Compatible Regular Expressions
-Version: %{src_version}
-Release: %{pkg_release}
-License: BSD
-Source: %{sf_download}/pcre/%{src_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-Conflicts: SUNWpcre
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
%package devel
@@ -34,71 +23,42 @@
rm -rf %name-%version
mkdir %name-%version
-%ifarch amd64 sparcv9
mkdir %name-%version/%_arch64
%pcre_64.prep -d %name-%version/%_arch64
-%endif
-
mkdir %name-%version/%base_arch
%pcre.prep -d %name-%version/%base_arch
%build
-%ifarch amd64 sparcv9
+%include arch64.inc
+%include stdenv.inc
%pcre_64.build -d %name-%version/%_arch64
-%endif
-
+%include base.inc
+%include stdenv.inc
%pcre.build -d %name-%version/%base_arch
%install
rm -rf $RPM_BUILD_ROOT
-%ifarch amd64 sparcv9
%pcre_64.install -d %name-%version/%_arch64
-%endif
-
%pcre.install -d %name-%version/%base_arch
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,bin)
-%dir %attr (0755, root, bin) %{_libdir}
+%defattr(-, root, root)
%{_libdir}/*.so.*
-%ifarch amd64 sparcv9
%dir %attr (0755, root, bin) %{_libdir}/%_arch64
%{_libdir}/%_arch64/*.so.*
-%endif
%files devel
-%defattr(-,root,bin)
-%dir %attr (0755, root, sys) %{_datadir}
+%defattr(-, root, root)
%{_datadir}/man
-%dir %attr (0755, root, other) %{_datadir}/doc
-%{_datadir}/doc/*
+%{_datadir}/doc
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%dir %attr (0755, root, bin) %{_libdir}
+%{_includedir}
+%{_libdir}/pkgconfig
%{_libdir}/*.so
-%ifarch amd64 sparcv9
-%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
-%{_libdir}/%{_arch64}/*.so
-%dir %attr (0755, root, other) %{_libdir}/%_arch64/pkgconfig
-%{_libdir}/%_arch64/pkgconfig/*
-%endif
-
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-
-%changelog
-* Sun Jul 6 2008 - [email protected]
-- modified for toolserver
-* Fri Jan 11 2008 - [email protected]
-- Add conflict with SUNWpcre, remove -i386 from package name
-* Mon Oct 29 2007 - [email protected]
-- Bump to 7.4 and fix Source URL.
-* 2007.Aug.11 - <shivakumar dot gn at gmail dot com>
-- Initial spec.
+%{_libdir}/%_arch64/*.so
+%{_libdir}/%_arch64/pkgconfig
+%{_bindir}
Modified: trunk/tools/ts-specs/base-specs/pcre.spec
===================================================================
--- trunk/tools/ts-specs/base-specs/pcre.spec 2009-03-19 19:04:36 UTC (rev
48591)
+++ trunk/tools/ts-specs/base-specs/pcre.spec 2009-03-19 19:07:28 UTC (rev
48592)
@@ -3,26 +3,19 @@
Source: %{sf_download}/pcre/pcre-%{version}.tar.gz
%prep
-%setup -q -n %{src_name}-%{version}
-export CC=cc
-export CXX=CC
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags"
+%setup -q -n pcre-%{version}
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{_bindir}
--enable-utf8 --enable-unicode-properties
-
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
if test "x$CPUS" = "x" -o $CPUS = 0; then
CPUS=1
fi
+%_configure --enable-utf8 --enable-unicode-properties
gmake -j$CPUS
%install
gmake install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
