OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 15-Jun-2008 09:39:03
Branch: HEAD Handle: 2008061508390300
Modified files:
openpkg-src/ctrlproxy ctrlproxy.patch ctrlproxy.spec
Log:
upgrading package: ctrlproxy 3.0.5 -> 3.0.7
Summary:
Revision Changes Path
1.2 +13 -8 openpkg-src/ctrlproxy/ctrlproxy.patch
1.3 +7 -7 openpkg-src/ctrlproxy/ctrlproxy.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ctrlproxy/ctrlproxy.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 ctrlproxy.patch
--- openpkg-src/ctrlproxy/ctrlproxy.patch 8 Dec 2007 08:49:16 -0000
1.1
+++ openpkg-src/ctrlproxy/ctrlproxy.patch 15 Jun 2008 07:39:03 -0000
1.2
@@ -1,18 +1,23 @@
Index: Makefile
---- Makefile.orig 2007-12-07 16:16:47 +0100
-+++ Makefile 2007-12-08 09:42:13 +0100
-@@ -83,15 +83,15 @@
+--- Makefile.orig 2008-04-10 18:24:40 +0200
++++ Makefile 2008-04-14 07:57:01 +0200
+@@ -101,19 +101,19 @@
linestack-cmd$(EXEEXT): src/linestack-cmd.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LIBS) -lreadline -rdynamic -o $@ $^
-+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
++ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
ctrlproxy$(EXEEXT): src/main.o $(objs) $(LIBIRC)
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
+ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+ ctrlproxyd$(EXEEXT): daemon/main.o $(objs) $(LIBIRC)
+ @echo Linking $@
+- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
++ @$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+
ctrlproxy-admin$(EXEEXT): src/admin-cmd.o
@echo Linking $@
- @$(LD) $(LDFLAGS) -rdynamic -o $@ $^ $(LIBS)
@@ -21,8 +26,8 @@
%.o: %.c
@echo Compiling $<
Index: Makefile.settings.in
---- Makefile.settings.in.orig 2007-12-07 16:16:47 +0100
-+++ Makefile.settings.in 2007-12-08 09:43:25 +0100
+--- Makefile.settings.in.orig 2008-04-10 18:24:40 +0200
++++ Makefile.settings.in 2008-04-14 07:56:03 +0200
@@ -9,12 +9,12 @@
localedir = @datadir@/locale
INSTALL = @INSTALL@
@@ -39,8 +44,8 @@
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
Index: src/internals.h
---- src/internals.h.orig 2007-12-07 16:16:47 +0100
-+++ src/internals.h 2007-12-08 09:42:13 +0100
+--- src/internals.h.orig 2008-04-10 18:24:41 +0200
++++ src/internals.h 2008-04-14 07:56:03 +0200
@@ -28,9 +28,10 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ctrlproxy/ctrlproxy.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 ctrlproxy.spec
--- openpkg-src/ctrlproxy/ctrlproxy.spec 1 Jan 2008 14:52:20 -0000
1.2
+++ openpkg-src/ctrlproxy/ctrlproxy.spec 15 Jun 2008 07:39:03 -0000
1.3
@@ -22,13 +22,13 @@
##
# package version
-%define V_opkg 3.0.5
-%define V_dist 3.0.5
+%define V_opkg 3.0.7
+%define V_dist 3.0.7
# package information
Name: ctrlproxy
Summary: Internet Relay Chat (IRC) Client Proxy
-URL: http://ctrlproxy.vernstok.nl/
+URL: http://www.ctrlproxy.org/
Vendor: J. Vernooij & D. Poelzleithner
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
@@ -36,10 +36,10 @@
Group: InstantMessaging
License: GPL
Version: %{V_opkg}
-Release: 20080101
+Release: 20080615
# list of sources
-Source0:
http://ctrlproxy.vernstok.nl/releases/ctrlproxy-%{V_dist}.tar.gz
+Source0: http://www.ctrlproxy.org/releases/ctrlproxy-%{V_dist}.tar.gz
Patch0: ctrlproxy.patch
# build information
@@ -62,7 +62,7 @@
%track
prog ctrlproxy = {
version = %{V_dist}
- url = http://ctrlproxy.vernstok.nl/
+ url = http://www.ctrlproxy.org/
regex = ctrlproxy-(__VER__)\.tar\.gz
}
@@ -79,7 +79,7 @@
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
