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-Jun-2003 09:45:23
Branch: HEAD Handle: 2003063008452201
Modified files:
openpkg-src/cvsps cvsps.patch cvsps.spec
openpkg-web news.txt
Log:
make sure it finds our(!) zlib
Summary:
Revision Changes Path
1.10 +10 -5 openpkg-src/cvsps/cvsps.patch
1.17 +3 -2 openpkg-src/cvsps/cvsps.spec
1.5096 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 cvsps.patch
--- openpkg-src/cvsps/cvsps.patch 12 Apr 2003 07:08:52 -0000 1.9
+++ openpkg-src/cvsps/cvsps.patch 30 Jun 2003 07:45:23 -0000 1.10
@@ -1,6 +1,6 @@
---- Makefile.orig 2003-03-13 02:12:25.000000000 +0100
-+++ Makefile 2003-03-13 18:06:37.000000000 +0100
-@@ -1,9 +1,8 @@
+--- Makefile.orig Fri Apr 11 16:06:01 2003
++++ Makefile Mon Jun 30 09:43:43 2003
+@@ -1,9 +1,10 @@
MAJOR=2
MINOR=0rc1
-CC?=gcc
@@ -9,11 +9,13 @@
-prefix?=/usr/local
+CC=gcc
+CFLAGS=-Wall -I. -DVERSION=\"$(MAJOR).$(MINOR)\"
++LDFLAGS=
++LIBS=-lz
+prefix=/usr/local
OBJS=\
cbtcommon/debug.o\
cbtcommon/hash.o\
-@@ -14,6 +13,9 @@
+@@ -19,8 +20,11 @@
all: cvsps
@@ -21,5 +23,8 @@
+ $(CC) $(CFLAGS) -c -o $@ $<
+
cvsps: $(OBJS)
- $(CC) -o cvsps $(OBJS)
+- $(CC) -o cvsps $(OBJS) -lz
++ $(CC) -o cvsps $(OBJS) $(LDFLAGS) $(LIBS)
+ install:
+ [ -d $(prefix)/bin ] || mkdir -p $(prefix)/bin
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvsps/cvsps.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 cvsps.spec
--- openpkg-src/cvsps/cvsps.spec 18 Jun 2003 09:21:11 -0000 1.16
+++ openpkg-src/cvsps/cvsps.spec 30 Jun 2003 07:45:23 -0000 1.17
@@ -33,7 +33,7 @@
Group: SCM
License: GPL
Version: 2.0rc1
-Release: 20030618
+Release: 20030630
# list of sources
Source0: http://www.cobite.com/cvsps/cvsps-%{version}.tar.gz
@@ -61,7 +61,8 @@
%patch -p0
%build
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags -O} \
+ CC="%{l_cc}" LDFLAGS="%{l_ldflags}"
%install
rm -rf $RPM_BUILD_ROOT
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5095 -r1.5096 news.txt
--- openpkg-web/news.txt 30 Jun 2003 07:41:26 -0000 1.5095
+++ openpkg-web/news.txt 30 Jun 2003 07:45:22 -0000 1.5096
@@ -1,3 +1,4 @@
+30-Jun-2003: Upgraded package: P<cvsps-2.0rc1-20030630>
30-Jun-2003: Upgraded package: P<cscope-15.4-20030630>
30-Jun-2003: Upgraded package: P<autogen-5.5.5-20030630>
30-Jun-2003: Upgraded package: P<perl-gtk-20030630-20030630>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
