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: 22-Jul-2003 16:45:18
Branch: HEAD Handle: 2003072215451701
Added files:
openpkg-src/lyx lyx.patch.xforms
Modified files:
openpkg-src/lyx lyx.spec
openpkg-web news.txt
Removed files:
openpkg-src/lyx xforms.patch
Log:
speclint police: use canonical patch filenames only
Summary:
Revision Changes Path
1.1 +157 -0 openpkg-src/lyx/lyx.patch.xforms
1.18 +2 -2 openpkg-src/lyx/lyx.spec
1.2 +0 -157 openpkg-src/lyx/xforms.patch
1.5725 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lyx/lyx.patch.xforms
============================================================================
$ cvs diff -u -r0 -r1.1 lyx.patch.xforms
--- /dev/null 2003-07-22 16:45:18.000000000 +0200
+++ lyx.patch.xforms 2003-07-22 16:45:18.000000000 +0200
@@ -0,0 +1,157 @@
+--- Imakefile.dist Thu Feb 20 15:00:08 2003
++++ Imakefile Thu Feb 20 16:42:03 2003
+@@ -2,13 +2,13 @@
+
+ /* Fairly important stuff */
+
+-#define OptimizationLevel -O4
++#define OptimizationLevel -O2
+ #define DoWall NO
+
+-#define BuildShared YES
++#define BuildShared NO
+ #define StaticLink YES
+
+-#define BuildGL YES
++#define BuildGL NO
+
+
+ /* Less Important or System Specific */
+@@ -32,23 +32,23 @@
+
+ /* Out in the Tall Weeds */
+
+-#define InstallNonstandard NO
+-#define XFormsNonstandardInstallDir /usr/local
++#define InstallNonstandard YES
++#define XFormsNonstandardInstallDir @l_prefix@
+
+-#define NonstandardXpm NO
++#define NonstandardXpm YES
+
+-#define XpmIncLoc /usr/local/include
+-#define XpmLibLoc /usr/local/lib
++#define XpmIncLoc @l_prefix@/include/X11
++#define XpmLibLoc @l_prefix@/lib
+
+-#define NonstandardTiff NO
++#define NonstandardTiff YES
+
+-#define TiffIncLoc /usr/local/include
+-#define TiffLibLoc /usr/local/lib
++#define TiffIncLoc @l_prefix@/include
++#define TiffLibLoc @l_prefix@/lib
+
+-#define NonstandardJpeg NO
++#define NonstandardJpeg YES
+
+-#define JpegIncLoc /usr/local/include
+-#define JpegLibLoc /usr/local/lib
++#define JpegIncLoc @l_prefix@/include
++#define JpegLibLoc @l_prefix@/lib
+
+ ######################################################################
+ # #
+--- demos/Imakefile.dist Thu Feb 20 15:26:40 2003
++++ demos/Imakefile Thu Feb 20 16:42:09 2003
+@@ -154,7 +154,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ [EMAIL PROTECTED]@/include
+
+ EXTRA_LIBRARIES = \
+ $(STATIC) \
+@@ -176,7 +176,7 @@
+
+ #if Optimize
+ IMAKE_OPTIMIZE = -DDoOptimize=1
+-OPTIMIZER = -O4
++OPTIMIZER = -O2
+ #else
+ OPTIMIZER =
+ #endif
+--- fd2ps/Imakefile.dist Thu Feb 20 15:26:40 2003
++++ fd2ps/Imakefile Thu Feb 20 16:41:52 2003
+@@ -64,7 +64,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ [EMAIL PROTECTED]@/include
+
+ EXTRA_LIBRARIES = \
+ $(STATIC) \
+@@ -83,7 +83,7 @@
+ CDEBUGFLAGS = -g $(OPTIMIZER)
+ #if Optimize
+ IMAKE_OPTIMIZE = -DDoOptimize=1
+-OPTIMIZER = -O4
++OPTIMIZER = -O2
+ #else
+ OPTIMIZER =
+ #endif
+--- fdesign/Imakefile.dist Thu Feb 20 15:26:40 2003
++++ fdesign/Imakefile Thu Feb 20 15:27:27 2003
+@@ -99,7 +99,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ [EMAIL PROTECTED]@/include
+
+
+ EXTRA_LIBRARIES = \
+--- gl/Imakefile.dist Thu Feb 20 15:26:40 2003
++++ gl/Imakefile Thu Feb 20 15:28:52 2003
+@@ -44,7 +44,7 @@
+ REQUIREDLIBS = \
+ $(LDPRELIB) \
+ $(XLIB) \
+- -L/usr/local/lib \
++ [EMAIL PROTECTED]@/lib \
+ -L../lib -lforms \
+ -lGL \
+ $(LGCC)
+@@ -56,7 +56,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ [EMAIL PROTECTED]@/include
+
+ EXTRA_DEFINES = \
+ -DMAKING_FORMS \
+--- image/Imakefile.dist Thu Feb 20 15:41:45 2003
++++ image/Imakefile Thu Feb 20 15:28:08 2003
+@@ -88,7 +88,7 @@
+ -I.
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ [EMAIL PROTECTED]@/include
+
+ EXTRA_DEFINES = \
+ $(HAVE_STRERROR )
+@@ -121,7 +121,8 @@
+ REQUIREDLIBS = \
+ $(LDPRELIB) \
+ $(XLIB) \
+- -L/usr/local/lib \
++ $(LDFLAGS) \
++ [EMAIL PROTECTED]@/lib \
+ -L../lib -lforms \
+ $(JPEGLIBDIR) -ljpeg \
+ $(TIFFLIBDIR) -ltiff \
+--- lib/Imakefile.dist Thu Feb 20 15:02:58 2003
++++ lib/Imakefile Thu Feb 20 15:03:08 2003
+@@ -128,7 +128,7 @@
+ -Ifd
+
+ DEPEND_DEFINES = \
+- -I/usr/local/include
++ [EMAIL PROTECTED]@/include
+
+ #if !BuildGL
+ NO_GL = -DNO_GL
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lyx/lyx.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 lyx.spec
--- openpkg-src/lyx/lyx.spec 21 Jul 2003 09:56:55 -0000 1.17
+++ openpkg-src/lyx/lyx.spec 22 Jul 2003 14:45:18 -0000 1.18
@@ -37,7 +37,7 @@
Group: Print
License: GPL
Version: %{V_lyx}
-Release: 20030721
+Release: 20030722
# package options
%option with_xforms no
@@ -46,7 +46,7 @@
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: xforms.patch
+Patch1: lyx.patch.xforms
# build information
Prefix: %{l_prefix}
@@ .
rm -f openpkg-src/lyx/xforms.patch <<'@@ .'
Index: openpkg-src/lyx/xforms.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5724 -r1.5725 news.txt
--- openpkg-web/news.txt 22 Jul 2003 14:37:55 -0000 1.5724
+++ openpkg-web/news.txt 22 Jul 2003 14:45:17 -0000 1.5725
@@ -1,3 +1,4 @@
+22-Jul-2003: Upgraded package: P<lyx-1.3.2-20030722>
22-Jul-2003: Upgraded package: P<openpkg-tool-20030722-20030722>
22-Jul-2003: Upgraded package: P<xerces-c-2.3.0-20030722>
22-Jul-2003: Upgraded package: P<pgp2-2.6.3i-20030722>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
