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: 08-Jun-2004 13:24:47
Branch: HEAD Handle: 2004060812244600
Modified files:
openpkg-src/lyx lyx.spec
Log:
cleanup packaging
Summary:
Revision Changes Path
1.27 +10 -10 openpkg-src/lyx/lyx.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lyx/lyx.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 lyx.spec
--- openpkg-src/lyx/lyx.spec 20 Feb 2004 17:37:37 -0000 1.26
+++ openpkg-src/lyx/lyx.spec 8 Jun 2004 11:24:46 -0000 1.27
@@ -38,7 +38,7 @@
Group: Print
License: GPL
Version: %{V_lyx}
-Release: 20040220
+Release: 20040608
# package options
%option with_xforms no
@@ -79,12 +79,9 @@
regex = lyx-(__VER__)\.tar\.gz
}
prog lyx:xforms = {
- comment = "rse: savannah.nongnu.org partly down"
version = %{V_xforms}
- url = http://savannah.nongnu.org/download/xforms/stable.pkg/
- regex = (1\.\d+(\.\d+)?)
- url =
http://savannah.nongnu.org/download/xforms/stable.pkg/__NEWVER__/
- regex = xforms-(__VER__)\.tar\.gz
+ url = http://savannah.nongnu.org/download/xforms/
+ regex = xforms-(\d+\.\d+|1\.[1-9]\.\d+)\.tar\.gz
}
%prep
@@ -112,12 +109,12 @@
%if "%{with_xforms}" == "yes"
( cd xforms-%{V_xforms}
%{l_shtool} subst %{l_value -s -a} \
- Imakefile */Imakefile
+ Imakefile */Imakefile
PATH=$x11_bin:$PATH
imake -DHasGcc2 -UHasSunC -DUseInstalled -I$x11_lib/X11/config
- %{l_make} Makefiles
- %{l_make} includes
- %{l_make} depend
+ %{l_make} %{l_mflags} Makefiles
+ %{l_make} %{l_mflags} includes
+ %{l_make} %{l_mflags} depend
%{l_make} %{l_mflags}
) || exit 1
%endif
@@ -158,6 +155,9 @@
%{l_make} %{l_mflags -O}
%install
+%if "%{with_xforms}" != "yes"
+ rm -rf $RPM_BUILD_ROOT
+%endif
( cd lyx-%{V_lyx}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
