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 Date: 03-Dec-2002 14:40:11
Branch: HEAD Handle: 197001010100001038919211
Modified files:
openpkg-src/openjade openjade.spec
Removed files:
openpkg-src/openjade mkcatalog
Log:
polish package
Summary:
Revision Changes Path
NONE +0 -291 openpkg-src/openjade/mkcatalog
1.24 +13 -7 openpkg-src/openjade/openjade.spec
____________________________________________________________________________
Index: openpkg-src/openjade/openjade.spec
============================================================
$ cvs diff -u -r1.23 -r1.24 openjade.spec
--- openpkg-src/openjade/openjade.spec 3 Dec 2002 11:07:09 -0000 1.23
+++ openpkg-src/openjade/openjade.spec 3 Dec 2002 13:40:11 -0000 1.24
@@ -37,13 +37,12 @@
# list of sources
Source0: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
-Source1: mkcatalog
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, gettext, opensp, gcc, perl
-PreReq: OpenPKG, openpkg >= 20020206
+PreReq: OpenPKG, openpkg >= 20020206, sgml
AutoReq: no
AutoReqProv: no
@@ -56,11 +55,11 @@
%setup -q
%build
- echo "ac_cv_func_setlocale=${ac_cv_func_setlocale='no'}" >config.cache
CC="%{l_cc}" \
CXX="%{l_cxx}" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
./configure \
--prefix=%{l_prefix} \
--datadir=%{l_prefix}/share/sgml/openjade \
@@ -81,9 +80,6 @@
datadir=$RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade
%{l_shtool} install -c -m 644 \
dsssl/* $RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade/
- echo 'CATALOG "openjade/catalog"' >$RPM_BUILD_ROOT%{l_prefix}/share/sgml/catalog
- %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE mkcatalog} $RPM_BUILD_ROOT%{l_prefix}/bin/
rm -f $RPM_BUILD_ROOT%{l_prefix}/share/sgml/openjade/ChangeLog
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ -91,5 +87,15 @@
%files -f files
%clean
-# rm -rf $RPM_BUILD_ROOT
+ rm -rf $RPM_BUILD_ROOT
+
+%post
+ if [ $1 -eq 1 ]; then
+ $RPM_INSTALL_PREFIX/bin/mkcatalog -q install openjade
+ fi
+
+%preun
+ if [ $1 -eq 0 ]; then
+ $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall openjade
+ fi
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
