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: 30-Dec-2002 21:40:19
Branch: HEAD Handle: 2002123020401800
Modified files:
openpkg-src/xerces-c xerces-c.spec
openpkg-web news.txt
Log:
switch to %option(s); cleanup package
Summary:
Revision Changes Path
1.6 +38 -41 openpkg-src/xerces-c/xerces-c.spec
1.2463 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xerces-c/xerces-c.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 xerces-c.spec
--- openpkg-src/xerces-c/xerces-c.spec 27 Dec 2002 10:31:51 -0000 1.5
+++ openpkg-src/xerces-c/xerces-c.spec 30 Dec 2002 20:40:18 -0000 1.6
@@ -22,16 +22,19 @@
## SUCH DAMAGE.
##
+# package version
+%define V_opkg 2.1.0
+%define V_dist 2_1_0
+
# package options
-%ifndef with_pth
-%define with_pth no
-%endif
-%ifndef with_threads
-%define with_threads no
-%endif
+%option with_pth no
+%option with_threads no
-%define V_xerces 2.1.0
-%define Vs_xerces 2_1_0
+# package option dependencies
+%if "%{with_pth}" == "yes"
+%undefine with_threads
+%define with_threads yes
+%endif
# package information
Name: xerces-c
@@ -42,23 +45,19 @@
Distribution: OpenPKG [EVAL]
Group: Web
License: Apache Software License 1.1
-Version: %{V_xerces}
-Release: 20021227
+Version: %{V_opkg}
+Release: 20021230
# list of sources
-Source0:
http://xml.apache.org/dist/xerces-c/stable/xerces-c-src%{Vs_xerces}.tar.gz
+Source0:
http://xml.apache.org/dist/xerces-c/stable/xerces-c-src%{V_dist}.tar.gz
Patch0: xerces-c.patch
Patch1: xerces-c-pth.patch
-%if "%{with_pth}" == "yes"
-%define with_threads yes
-%endif
-
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, gcc, make, autoconf, libtool
-PreReq: OpenPKG
+BuildPreReq: OpenPKG, openpkg >= 20021230, gcc, make, autoconf, libtool
+PreReq: OpenPKG, openpkg >= 20021230
%if "%{with_pth}" == "yes"
BuildPreReq: pth
PreReq: pth
@@ -69,12 +68,10 @@
%description
Xerces-C++ is a validating XML parser written in a portable subset of C++.
- Options:
- --define 'with_threads' %{with_threads}'
- --define 'with_pth %{with_pth}'
+ %options -p12
%prep
- %setup -q -n xerces-c-src%{Vs_xerces}
+ %setup -q -n xerces-c-src%{V_dist}
%patch0 -p0
%if "%{with_pth}" == "yes"
%patch1 -p0
@@ -82,32 +79,32 @@
%build
rm -rf $RPM_BUILD_ROOT
- ( XERCESCROOT=`pwd` ;
- export XERCESCROOT ;
+ ( XERCESCROOT=`pwd`
+ export XERCESCROOT
%{l_shtool} subst \
-e 's;@l_ar@;%{l_libtool} --mode=link c++ -static -o;' \
obj/Makefile.in
- cd $XERCESCROOT/src/xercesc ;
- autoconf ;
+ cd $XERCESCROOT/src/xercesc
+ %{l_prefix}/bin/autoconf
%if "%{with_threads}" == "yes"
- os="freebsd" ;
- pt="pthread" ;
+ os="freebsd"
+ pt="pthread"
case "%{l_target}" in
%if "%{with_pth}" == "yes"
- *-freebsd*) os=freebsd ; pt=pth ;;
+ *-freebsd*) os=freebsd; pt=pth ;;
%else
- *-freebsd*) os=freebsd ; pt=pthread ;;
+ *-freebsd*) os=freebsd; pt=pthread ;;
%endif
- *-linux*) os=linux ; pt=pthread ;;
- *-solaris*) os=solaris ; pt=pthread ;;
- *-irix*) os=irix ; pt=sproc ;;
- *-hpux-10.*) os=hp-10 ; pt=none ;;
- *-hpux-11.*) os=hp-11 ; pt=none ;;
- *-aix*) os=aix ; pt=pthread ;;
- esac ;
+ *-linux*) os=linux; pt=pthread ;;
+ *-solaris*) os=solaris; pt=pthread ;;
+ *-irix*) os=irix; pt=sproc ;;
+ *-hpux-10.*) os=hp-10; pt=none ;;
+ *-hpux-11.*) os=hp-11; pt=none ;;
+ *-aix*) os=aix; pt=pthread ;;
+ esac
%else
- os="freebsd" ;
- pt="none" ;
+ os="freebsd"
+ pt="none"
case "%{l_target}" in
*-freebsd*) os=freebsd ;;
*-linux*) os=linux ;;
@@ -134,9 +131,9 @@
)
%install
- ( XERCESCROOT=`pwd` ;
- export XERCESCROOT ;
- cd $XERCESCROOT/src/xercesc ;
+ ( XERCESCROOT=`pwd`
+ export XERCESCROOT
+ cd $XERCESCROOT/src/xercesc
%{l_make} %{l_mflags} install "PREFIX=$RPM_BUILD_ROOT%{l_prefix}"
)
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2462 -r1.2463 news.txt
--- openpkg-web/news.txt 30 Dec 2002 20:38:50 -0000 1.2462
+++ openpkg-web/news.txt 30 Dec 2002 20:40:18 -0000 1.2463
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<xerces-c-2.1.0-20021230>
30-Dec-2002: Upgraded package: P<sablotron-0.97-20021230>
30-Dec-2002: Upgraded package: P<txt2pdf-6.3-20021230>
30-Dec-2002: Upgraded package: P<geoip-1.1.4-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
