OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 27-Mar-2009 09:46:25 Branch: HEAD Handle: 2009032708462301 Modified files: openpkg-src/the the.patch the.spec Log: upgrading package: the 3.2 -> 3.3b3 Summary: Revision Changes Path 1.2 +28 -30 openpkg-src/the/the.patch 1.6 +11 -6 openpkg-src/the/the.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/the/the.patch ============================================================================ $ cvs diff -u -r1.1 -r1.2 the.patch --- openpkg-src/the/the.patch 2 Apr 2006 11:28:35 -0000 1.1 +++ openpkg-src/the/the.patch 27 Mar 2009 08:46:23 -0000 1.2 @@ -1,23 +1,21 @@ Index: Makefile.in ---- Makefile.in.orig 2006-01-30 09:08:34 +0100 -+++ Makefile.in 2006-04-02 13:22:20 +0200 -@@ -43,7 +43,8 @@ +--- Makefile.in.orig 2008-02-29 01:56:44 +0100 ++++ Makefile.in 2009-03-27 09:41:15 +0100 +@@ -45,7 +45,7 @@ THETYPE = @THETYPE@ INCDIR = $(srcdir) --CPPFLAGS = -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\" -+THEHOME = $(prefix)/share/the -+CPPFLAGS = -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(THEHOME)/\" +-CPPFLAGS = -I. -I$(INCDIR) $(DEBUG) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\" ++CPPFLAGS = -I. -I$(INCDIR) $(DEBUG) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/the/\" CCFLAGS = -c $(CFLAGS) $(CPPFLAGS) @REXX_INCLUDES@ @MH_CURSES_INC@ -@@ -278,30 +279,30 @@ - installbase: $(THEBIN) the.man THE_Help.txt - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) +@@ -285,29 +285,29 @@ + + installdoc: the.man THE_Help.txt $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/THE -+ $(INSTALL) -m 755 -d $(DESTDIR)$(THEHOME) - $(INSTALL) -m 755 -c ./$(THEBIN) $(DESTDIR)$(bindir)/$(THEBIN) ++ $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/the $(INSTALL) -m 644 -c $(srcdir)/the.1 $(DESTDIR)$(mandir)/man1/the.1 - $(INSTALL) -m 644 -c ./THE_Help.txt $(DESTDIR)$(datadir)/THE/THE_Help.txt - $(INSTALL) -m 644 -c $(srcdir)/append.the $(DESTDIR)$(datadir)/THE/append.the @@ -37,28 +35,28 @@ - $(INSTALL) -m 644 -c $(srcdir)/config.the $(DESTDIR)$(datadir)/THE/config.the - $(INSTALL) -m 644 -c $(srcdir)/tags.the $(DESTDIR)$(datadir)/THE/tags.the - $(INSTALL) -m 644 -c $(srcdir)/codecomp.the $(DESTDIR)$(datadir)/THE/codecomp.the -+ $(INSTALL) -m 644 -c ./THE_Help.txt $(DESTDIR)$(THEHOME)/THE_Help.txt -+ $(INSTALL) -m 644 -c $(srcdir)/append.the $(DESTDIR)$(THEHOME)/append.the -+ $(INSTALL) -m 644 -c $(srcdir)/comm.the $(DESTDIR)$(THEHOME)/comm.the -+ $(INSTALL) -m 644 -c $(srcdir)/build.the $(DESTDIR)$(THEHOME)/build.the -+ $(INSTALL) -m 644 -c $(srcdir)/uncomm.the $(DESTDIR)$(THEHOME)/uncomm.the -+ $(INSTALL) -m 644 -c $(srcdir)/total.the $(DESTDIR)$(THEHOME)/total.the -+ $(INSTALL) -m 644 -c $(srcdir)/match.the $(DESTDIR)$(THEHOME)/match.the -+ $(INSTALL) -m 644 -c $(srcdir)/rm.the $(DESTDIR)$(THEHOME)/rm.the -+ $(INSTALL) -m 644 -c $(srcdir)/nl.the $(DESTDIR)$(THEHOME)/nl.the -+ $(INSTALL) -m 644 -c $(srcdir)/words.the $(DESTDIR)$(THEHOME)/words.the -+ $(INSTALL) -m 644 -c $(srcdir)/l.the $(DESTDIR)$(THEHOME)/l.the -+ $(INSTALL) -m 644 -c $(srcdir)/compile.the $(DESTDIR)$(THEHOME)/compile.the -+ $(INSTALL) -m 644 -c $(srcdir)/spell.the $(DESTDIR)$(THEHOME)/spell.the -+ $(INSTALL) -m 644 -c $(srcdir)/demo.the $(DESTDIR)$(THEHOME)/demo.the -+ $(INSTALL) -m 644 -c $(srcdir)/cua.the $(DESTDIR)$(THEHOME)/cua.the -+ $(INSTALL) -m 644 -c $(srcdir)/config.the $(DESTDIR)$(THEHOME)/config.the -+ $(INSTALL) -m 644 -c $(srcdir)/tags.the $(DESTDIR)$(THEHOME)/tags.the -+ $(INSTALL) -m 644 -c $(srcdir)/codecomp.the $(DESTDIR)$(THEHOME)/codecomp.the ++ $(INSTALL) -m 644 -c ./THE_Help.txt $(DESTDIR)$(datadir)/the/THE_Help.txt ++ $(INSTALL) -m 644 -c $(srcdir)/append.the $(DESTDIR)$(datadir)/the/append.the ++ $(INSTALL) -m 644 -c $(srcdir)/comm.the $(DESTDIR)$(datadir)/the/comm.the ++ $(INSTALL) -m 644 -c $(srcdir)/build.the $(DESTDIR)$(datadir)/the/build.the ++ $(INSTALL) -m 644 -c $(srcdir)/uncomm.the $(DESTDIR)$(datadir)/the/uncomm.the ++ $(INSTALL) -m 644 -c $(srcdir)/total.the $(DESTDIR)$(datadir)/the/total.the ++ $(INSTALL) -m 644 -c $(srcdir)/match.the $(DESTDIR)$(datadir)/the/match.the ++ $(INSTALL) -m 644 -c $(srcdir)/rm.the $(DESTDIR)$(datadir)/the/rm.the ++ $(INSTALL) -m 644 -c $(srcdir)/nl.the $(DESTDIR)$(datadir)/the/nl.the ++ $(INSTALL) -m 644 -c $(srcdir)/words.the $(DESTDIR)$(datadir)/the/words.the ++ $(INSTALL) -m 644 -c $(srcdir)/l.the $(DESTDIR)$(datadir)/the/l.the ++ $(INSTALL) -m 644 -c $(srcdir)/compile.the $(DESTDIR)$(datadir)/the/compile.the ++ $(INSTALL) -m 644 -c $(srcdir)/spell.the $(DESTDIR)$(datadir)/the/spell.the ++ $(INSTALL) -m 644 -c $(srcdir)/demo.the $(DESTDIR)$(datadir)/the/demo.the ++ $(INSTALL) -m 644 -c $(srcdir)/cua.the $(DESTDIR)$(datadir)/the/cua.the ++ $(INSTALL) -m 644 -c $(srcdir)/config.the $(DESTDIR)$(datadir)/the/config.the ++ $(INSTALL) -m 644 -c $(srcdir)/tags.the $(DESTDIR)$(datadir)/the/tags.the ++ $(INSTALL) -m 644 -c $(srcdir)/codecomp.the $(DESTDIR)$(datadir)/the/codecomp.the for a in $(srcdir)/*.tld; do \ bn=`basename $$a`; \ - $(INSTALL) -m 644 -c $$a $(DESTDIR)$(datadir)/THE/$$bn; \ -+ $(INSTALL) -m 644 -c $$a $(DESTDIR)$(THEHOME)/$$bn; \ ++ $(INSTALL) -m 644 -c $$a $(DESTDIR)$(datadir)/the/$$bn; \ done; binary: $(BASE_BINARY) @@ . patch -p0 <<'@@ .' Index: openpkg-src/the/the.spec ============================================================================ $ cvs diff -u -r1.5 -r1.6 the.spec --- openpkg-src/the/the.spec 1 Jan 2008 15:06:00 -0000 1.5 +++ openpkg-src/the/the.spec 27 Mar 2009 08:46:24 -0000 1.6 @@ -21,6 +21,10 @@ ## SUCH DAMAGE. ## +# package version +%define V_opkg 3.3b3 +%define V_dist 3.3B3 + # package information Name: the Summary: The Hessling Editor (THE) @@ -31,11 +35,11 @@ Class: EVAL Group: Editor License: GPL -Version: 3.2 -Release: 20080101 +Version: %{V_opkg} +Release: 20090327 # list of sources -Source0: http://switch.dl.sourceforge.net/hessling-editor/THE-%{version}.tar.gz +Source0: http://switch.dl.sourceforge.net/hessling-editor/THE-%{V_dist}.tar.gz Patch0: the.patch # build information @@ -58,13 +62,13 @@ %track prog the = { - version = %{version} + version = %{V_dist} url = http://prdownloads.sourceforge.net/hessling-editor/ - regex = THE-(\d+\.\d+(\.\d+)*)\.tar\.gz + regex = THE-(\d+\.\d+(\.\d+)*(?:B\d+)?)\.tar\.gz } %prep - %setup -q -n THE-%{version} + %setup -q -n THE-%{V_dist} %patch -p0 %build @@ -76,6 +80,7 @@ LDFLAGS="%{l_ldflags}" \ ./configure \ --prefix=%{l_prefix} \ + --mandir=%{l_prefix}/man \ --with-ncurses \ --with-curseslibdir=%{l_prefix}/lib \ --with-rexxlibdir=%{l_prefix}/lib \ @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org