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: 12-Oct-2006 20:28:22
Branch: HEAD Handle: 2006101219282200
Modified files:
openpkg-src/nano nano.patch nano.spec
Log:
upgrade to latest of 1.3 series (yes, no joke) and fix building by
adding missing pkgconfig dependency
Summary:
Revision Changes Path
1.4 +20 -4 openpkg-src/nano/nano.patch
1.56 +11 -9 openpkg-src/nano/nano.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nano/nano.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 nano.patch
--- openpkg-src/nano/nano.patch 30 Oct 2005 09:00:58 -0000 1.3
+++ openpkg-src/nano/nano.patch 12 Oct 2006 18:28:22 -0000 1.4
@@ -1,10 +1,26 @@
Index: configure
---- configure.orig 2005-10-24 03:44:35 +0200
-+++ configure 2005-10-30 09:31:17 +0100
-@@ -6385,6 +6385,7 @@
+--- configure.orig 2006-10-02 06:23:04 +0200
++++ configure 2006-10-12 20:26:08 +0200
+@@ -7141,6 +7141,7 @@
int main(void)
{
- SLutf8_enable(TRUE);
+ SLutf8_enable(1);
++ SLcurses_start_color();
+ return 0;
+ }
+ _ACEOF
+@@ -7293,6 +7294,7 @@
+ int main(void)
+ {
+ SLutf8_enable(1);
++ SLcurses_start_color();
+ return 0;
+ }
+ _ACEOF
+@@ -7358,6 +7360,7 @@
+ int main(void)
+ {
+ SLutf8_enable(1);
+ SLcurses_start_color();
return 0;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nano/nano.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 nano.spec
--- openpkg-src/nano/nano.spec 26 Jun 2006 10:26:42 -0000 1.55
+++ openpkg-src/nano/nano.spec 12 Oct 2006 18:28:22 -0000 1.56
@@ -23,8 +23,9 @@
##
# package version
-%define V_major 1.3
-%define V_minor 12
+%define V_opkg 1.9.99p2
+%define V_dist 1.9.99pre2
+%define V_subdir 1.3
# package information
Name: nano
@@ -36,17 +37,17 @@
Class: BASE
Group: Editor
License: GPL
-Version: %{V_major}.%{V_minor}
-Release: 20060626
+Version: %{V_opkg}
+Release: 20061012
# list of sources
-Source0:
http://www.nano-editor.org/dist/v%{V_major}/nano-%{version}.tar.gz
+Source0:
http://www.nano-editor.org/dist/v%{V_subdir}/nano-%{V_dist}.tar.gz
Patch0: nano.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: slang >= 2.0.6-20060626
PreReq: slang >= 2.0.6-20060626
@@ -59,13 +60,13 @@
%track
prog nano = {
- version = %{version}
+ version = %{V_dist}
url = http://www.nano-editor.org/download.php
- regex = nano-(__VER__)\.tar\.gz
+ regex = nano-(\d+\.\d+.\d+(pre\d+)?)\s*\.tar\.gz
}
%prep
- %setup -q
+ %setup -q -n nano-%{V_dist}
%patch -p0
%build
@@ -75,6 +76,7 @@
LIBS="`pkg-config slang --libs`" \
./configure \
--prefix=%{l_prefix} \
+ --datarootdir=%{l_prefix} \
--with-slang=%{l_prefix} \
--enable-utf8 \
--disable-nls
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
