OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 27-Nov-2003 19:11:36
Branch: HEAD Handle: 2003112718113501
Modified files:
openpkg-src/crm114 crm114.spec
openpkg-web news.txt
Log:
simplify packaging by switching to new 'tre' package
Summary:
Revision Changes Path
1.14 +5 -21 openpkg-src/crm114/crm114.spec
1.7578 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/crm114/crm114.spec
============================================================================
$ cvs diff -u -r1.13 -r1.14 crm114.spec
--- openpkg-src/crm114/crm114.spec 17 Nov 2003 08:23:02 -0000 1.13
+++ openpkg-src/crm114/crm114.spec 27 Nov 2003 18:11:36 -0000 1.14
@@ -26,7 +26,6 @@
# package version
%define V_dist 20031111-RC8
%define V_opkg 20031111rc8
-%define V_tre 0.6.1
# package information
Name: crm114
@@ -38,7 +37,7 @@
Group: Text
License: GPL
Version: %{V_opkg}
-Release: 20031117
+Release: 20031127
# list of sources
Source0: http://crm114.sourceforge.net/crm114-%{V_dist}.src.tar.gz
@@ -46,8 +45,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, gcc, make
-PreReq: OpenPKG, openpkg >= 20030103
+BuildPreReq: OpenPKG, openpkg >= 20030103, tre, gcc, make
+PreReq: OpenPKG, openpkg >= 20030103, tre
AutoReq: no
AutoReqProv: no
@@ -65,27 +64,12 @@
%setup -q -n crm114-%{V_dist}.src
%build
- ( cd tre-%{V_tre}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- ./configure \
- --disable-shared \
- --disable-agrep \
- --disable-wchar \
- --disable-nls
- --without-libiconv-prefix \
- --without-libintl-prefix
- %{l_make} %{l_mflags -O}
- ) || exit $?
%{l_shtool} subst \
- -e 's;-ltre;-Ltre-%{V_tre}/lib/.libs -ltre;' \
+ -e 's;-ltre;%{l_ldflags} -ltre;' \
-e 's;-static;;' \
Makefile
- %{l_shtool} subst \
- -e 's;<tre/regex\.h>;"tre-%{V_tre}/lib/regex.h";' \
- crm114_sysincludes.h
%{l_make} %{l_mflags} \
- CC="%{l_cc}" CFLAGS="%{l_cflags -O} -I."
+ CC="%{l_cc}" CFLAGS="%{l_cflags -O} -I. %{l_cppflags}"
cat intro.txt quickref.txt faq.txt >crm114.1
%install
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7577 -r1.7578 news.txt
--- openpkg-web/news.txt 27 Nov 2003 18:08:25 -0000 1.7577
+++ openpkg-web/news.txt 27 Nov 2003 18:11:35 -0000 1.7578
@@ -1,3 +1,4 @@
+27-Nov-2003: Upgraded package: P<crm114-20031111rc8-20031127>
27-Nov-2003: New package: P<tre-0.6.2-20031127>
27-Nov-2003: New package: P<php5-5.0.0b2-20031127>
27-Nov-2003: Upgraded package: P<distcc-2.11.2-20031127>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
