OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 29-Sep-2003 12:35:26 Branch: HEAD Handle: 2003092911352402 Modified files: openpkg-src/lyx lyx.spec openpkg-web news.txt Removed files: openpkg-src/lyx lyx.patch Log: Reduce and move patch into three subst, and update from 1.3.2 to 1.3.3 Summary: Revision Changes Path 1.6 +0 -418 openpkg-src/lyx/lyx.patch 1.20 +16 -7 openpkg-src/lyx/lyx.spec 1.6780 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ rm -f openpkg-src/lyx/lyx.patch <<'@@ .' Index: openpkg-src/lyx/lyx.patch ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: openpkg-src/lyx/lyx.spec ============================================================================ $ cvs diff -u -r1.19 -r1.20 lyx.spec --- openpkg-src/lyx/lyx.spec 13 Aug 2003 09:01:55 -0000 1.19 +++ openpkg-src/lyx/lyx.spec 29 Sep 2003 10:35:26 -0000 1.20 @@ -24,7 +24,7 @@ ## # package versions -%define V_lyx 1.3.2 +%define V_lyx 1.3.3 %define V_xforms 1.0 # package information @@ -37,7 +37,7 @@ Group: Print License: GPL Version: %{V_lyx} -Release: 20030813 +Release: 20030929 # package options %option with_xforms no @@ -45,8 +45,7 @@ # list of sources Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{V_lyx}.tar.gz Source1: http://savannah.nongnu.org/download/xforms/stable.pkg/%{V_xforms}/xforms-%{V_xforms}.tar.gz -Patch0: lyx.patch -Patch1: lyx.patch.xforms +Patch0: lyx.patch.xforms # build information Prefix: %{l_prefix} @@ -74,13 +73,23 @@ %prep %setup -q - %patch0 -p1 %if "%{with_xforms}" == "yes" %setup -q -T -D -a 1 ( cd xforms-%{V_xforms} - %patch1 -p0 + %patch0 -p0 ) || exit 1 %endif + %{l_shtool} subst \ + -e 's;\(LyXLength::\)\(PC[^_a-zA-Z0-9]\);\1LYX_\2;g' \ + -e 's;\(LyXLength::\)\(SP[^_a-zA-Z0-9]\);\1LYX_\2;g' \ + src/lyxlength.C + %{l_shtool} subst \ + -e 's;\([ \t]*\)PC[ \t]*,;\1LYX_PC,;g' \ + -e 's;\([ \t]*\)SP[ \t]*,;\1LYX_SP,;g' \ + src/lyxlength.h + %{l_shtool} subst \ + -e 's;\(test -f xfonts/PSres.upr.*\);\1 || true;g' \ + lib/Makefile.in %build x11_bin=`%{l_prefix}/etc/rc --query x11_bindir` @@ -136,7 +145,7 @@ %install ( cd lyx-%{V_lyx} - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true ) || exit 1 @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.6779 -r1.6780 news.txt --- openpkg-web/news.txt 29 Sep 2003 08:33:42 -0000 1.6779 +++ openpkg-web/news.txt 29 Sep 2003 10:35:24 -0000 1.6780 @@ -1,3 +1,4 @@ +29-Sep-2003: Upgraded package: P<lyx-1.3.3-20030929> 29-Sep-2003: Upgraded package: P<mutt-1.4.1i-20030929> 29-Sep-2003: Upgraded package: P<geoip-1.3.0-20030929> 29-Sep-2003: Upgraded package: P<cvsd-1.0.0-20030929> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]