openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

merge of 'bfc2b09e68cc38c22dd8491ae538a8b161bbd6ee' 

and 'c6d0e62c452808ebd89cbe9188210ca9a0e26be4'
master
Dr. Ralf S. Engelschall 16 years ago
parent
fdc3660811 3c84430773
commit
c1ebbd8d22
19 changed files with 108 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      cgdb/cgdb.patch
  2. 7
      cgdb/cgdb.spec
  3. 8
      drupal-module-misc/drupal-module-misc.spec
  4. 4
      gcc45/gcc45.spec
  5. 4
      ghostscript/ghostscript.spec
  6. 4
      mysql/mysql.spec
  7. 6
      ncurses/ncurses.spec
  8. 4
      perl-bytecode/perl-bytecode.spec
  9. 6
      perl-dbi/perl-dbi.patch
  10. 4
      perl-dbi/perl-dbi.spec
  11. 22
      perl-kerberos/perl-kerberos.patch
  12. 4
      perl-kerberos/perl-kerberos.spec
  13. 55
      png/png.patch
  14. 6
      png/png.spec
  15. 4
      python-text/python-text.spec
  16. 18
      rsync/rsync.patch
  17. 4
      rsync/rsync.spec
  18. 6
      seed7/seed7.spec
  19. 4
      statsvn/statsvn.spec

22
cgdb/cgdb.patch
Unescape View File

@ -1,6 +1,6 @@
Index: various/util/src/pseudo.c
--- various/util/src/pseudo.c.orig 2004-07-14 18:20:32 +0200
+++ various/util/src/pseudo.c 2005-02-06 15:54:05 +0100
--- various/util/src/pseudo.c.orig 2009-10-05 12:23:32 +0200
+++ various/util/src/pseudo.c 2010-01-05 10:52:46 +0100
@@ -35,6 +35,7 @@
*/
@ -9,7 +9,7 @@ Index: various/util/src/pseudo.c
#define _GNU_SOURCE /* ptsname_r() under Linux */
#include <fcntl.h>
#include <grp.h>
@@ -49,7 +50,6 @@
@@ -53,7 +54,6 @@
#include <libutil.h>
#endif
@ -17,3 +17,19 @@ Index: various/util/src/pseudo.c
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <stdio.h>
@@ -329,6 +329,7 @@
/* Turn the slave into a terminal */
+#ifndef __FreeBSD__
#ifndef HAVE_CYGWIN
#ifndef HAVE_LINUX /* linux does not use the streams module */
/*
@@ -359,6 +360,7 @@
#endif
#endif
#endif
+#endif
#else /* HAVE_DEV_PTMX */
#ifdef HAVE_DEV_PTS_AND_PTC

7
cgdb/cgdb.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: Debugging
License: GPL
Version: 0.6.4
Release: 20080101
Version: 0.6.5
Release: 20100105
# list of sources
Source0: http://switch.dl.sourceforge.net/cgdb/cgdb-%{version}.tar.gz
@ -74,6 +74,8 @@ AutoReqProv: no
LIBS="-lgetopt" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--infodir=%{l_prefix}/info \
--with-ncurses-prefix=%{l_prefix}
%{l_make} %{l_mflags}
@ -81,6 +83,7 @@ AutoReqProv: no
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files

8
drupal-module-misc/drupal-module-misc.spec
Unescape View File

@ -39,7 +39,7 @@
%define V_module_biblio 6.x-1.9
%define V_module_bitcache 6.x-1.0-beta2
%define V_module_calendar 6.x-2.2
%define V_module_captcha 6.x-2.0
%define V_module_captcha 6.x-2.1
%define V_module_captcha_pack 6.x-1.0-beta3
%define V_module_cck 6.x-2.6
%define V_module_cck_blocks 6.x-1.1
@ -95,7 +95,7 @@
%define V_module_i18n 6.x-1.2
%define V_module_iconizer 6.x-1.1
%define V_module_image 6.x-1.0-beta3
%define V_module_image_caption 6.x-2.3
%define V_module_image_caption 6.x-2.4
%define V_module_imce 6.x-1.3
%define V_module_imceimage 6.x-1.0-beta2
%define V_module_img_assist 6.x-2.0-alpha4
@ -184,7 +184,7 @@
%define V_module_virtual_site 6.x-1.3
%define V_module_vocabindex 6.x-2.2
%define V_module_votingapi 6.x-2.3
%define V_module_weather 6.x-5.7
%define V_module_weather 6.x-5.8
%define V_module_wishlist 6.x-2.3
%define V_module_wysiwyg 6.x-2.0
%define V_module_wysiwyg_filter 6.x-1.4
@ -216,7 +216,7 @@ Class: PLUS
Group: CMS
License: GPL
Version: %{V_drupal}
Release: 20091230
Release: 20100105
# list of sources
Source0: http://ftp.drupal.org/files/projects/acl-%{V_module_acl}.tar.gz

4
gcc45/gcc45.spec
Unescape View File

@ -26,7 +26,7 @@
# package version
%define V_full 4.5
%define V_comp 45
%define V_snap 20091224
%define V_snap 20091231
# package information
Name: gcc45
@ -39,7 +39,7 @@ Class: EVAL
Group: Compiler
License: GPL
Version: %{V_full}s%{V_snap}
Release: 20091225
Release: 20100105
# package options
%option with_binutils yes

4
ghostscript/ghostscript.spec
Unescape View File

@ -27,7 +27,7 @@
%define V_font_std 8.11
%define V_font_other 6.0
%define V_jpeg 6b
%define V_png 1.2.41
%define V_png 1.4.0
%define V_zlib 1.2.3
# package information
@ -41,7 +41,7 @@ Class: BASE
Group: Postscript
License: GPL
Version: %{V_real}
Release: 20091203
Release: 20100105
# package options
%option with_x11 yes

4
mysql/mysql.spec
Unescape View File

@ -23,7 +23,7 @@
# package version
%define V_major 5.1
%define V_minor 41
%define V_minor 42
%define V_mysql %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
%define V_jdbc 5.1.10
@ -39,7 +39,7 @@ Class: BASE
Group: Database
License: GPL
Version: %{V_opkg}
Release: 20091121
Release: 20100105
# package options
%option with_server yes

6
ncurses/ncurses.spec
Unescape View File

@ -32,9 +32,10 @@
%define V_patch7 20091219
%define V_patch8 20091226
%define V_patch9 20091227
%define V_patch10 20100102
%define V_patchB %{V_patch1}
%define V_patchL %{V_patch9}
%define V_patches 9
%define V_patchL %{V_patch10}
%define V_patches 10
# package information
Name: ncurses
@ -60,6 +61,7 @@ Patch6: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V
Patch7: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch7}.patch.gz
Patch8: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch8}.patch.gz
Patch9: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch9}.patch.gz
Patch10: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch10}.patch.gz
Patch100: ncurses.patch
# build information

4
perl-bytecode/perl-bytecode.spec
Unescape View File

@ -23,7 +23,7 @@
# versions of individual parts
%define V_perl 5.10
%define V_b_c 1.12
%define V_b_c 1.15
%define V_b_utils 0.08
%define V_b_recdeparse 0.04
%define V_b_generate 1.22
@ -39,7 +39,7 @@ Class: BASE
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
Release: 20091231
Release: 20100105
# list of sources
Source0: http://www.cpan.org/authors/id/R/RU/RURBAN/B-C-%{V_b_c}.tar.gz

6
perl-dbi/perl-dbi.patch
Unescape View File

@ -1,6 +1,6 @@
Index: DBD-SQLite-1.28_01/Makefile.PL
--- DBD-SQLite-1.28_01/Makefile.PL.orig 2009-10-06 08:16:49 +0200
+++ DBD-SQLite-1.28_01/Makefile.PL 2009-10-12 08:29:04 +0200
Index: DBD-SQLite-1.28_02/Makefile.PL
--- DBD-SQLite-1.28_02/Makefile.PL.orig 2009-10-06 08:16:49 +0200
+++ DBD-SQLite-1.28_02/Makefile.PL 2009-10-12 08:29:04 +0200
@@ -17,46 +17,7 @@
return @_;
}

4
perl-dbi/perl-dbi.spec
Unescape View File

@ -34,7 +34,7 @@
%define V_dbd_anydata 0.09
%define V_dbd_csv 0.22
%define V_dbd_sprite 0.59
%define V_dbd_sqlite 1.28_01
%define V_dbd_sqlite 1.28_02
%define V_dbd_mysql 4.013
%define V_dbd_pgsql 2.15.1
%define V_dbd_oracle 1.23
@ -54,7 +54,7 @@ Class: BASE
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
Release: 20091224
Release: 20100105
# package options
%option with_sqlite yes

22
perl-kerberos/perl-kerberos.patch
Unescape View File

@ -1,6 +1,6 @@
Index: Authen-Krb5-Admin-0.11/Makefile.PL
--- Authen-Krb5-Admin-0.11/Makefile.PL.orig 2008-02-25 14:43:46 +0100
+++ Authen-Krb5-Admin-0.11/Makefile.PL 2008-03-17 08:08:40 +0100
+++ Authen-Krb5-Admin-0.11/Makefile.PL 2010-01-05 11:23:36 +0100
@@ -31,8 +31,8 @@
# location of Kerberos 5 libraries and header files
@ -30,7 +30,7 @@ Index: Authen-Krb5-Admin-0.11/Makefile.PL
+
Index: Authen-Krb5-Easy-0.90/Makefile.PL
--- Authen-Krb5-Easy-0.90/Makefile.PL.orig 2002-04-17 01:24:52 +0200
+++ Authen-Krb5-Easy-0.90/Makefile.PL 2008-03-17 08:08:40 +0100
+++ Authen-Krb5-Easy-0.90/Makefile.PL 2010-01-05 11:23:36 +0100
@@ -4,10 +4,10 @@
# get some stuff we need to know
@ -44,21 +44,21 @@ Index: Authen-Krb5-Easy-0.90/Makefile.PL
chomp($krbincs);
WriteMakefile(
Index: Authen-Krb5-Simple-0.40/Makefile.PL
--- Authen-Krb5-Simple-0.40/Makefile.PL.orig 2008-02-24 20:19:38 +0100
+++ Authen-Krb5-Simple-0.40/Makefile.PL 2008-03-17 08:09:02 +0100
@@ -57,7 +57,7 @@
Index: Authen-Krb5-Simple-0.42/Makefile.PL
--- Authen-Krb5-Simple-0.42/Makefile.PL.orig 2009-08-06 04:48:30 +0200
+++ Authen-Krb5-Simple-0.42/Makefile.PL 2010-01-05 11:24:34 +0100
@@ -56,7 +56,7 @@
#
check_lib_or_exit(
lib => [qw( krb5 k5crypto com_err )],
lib => [qw( krb5 )],
- libpath => \@kr_lib_dirs
+ libpath => \@krb_lib_dirs
);
) unless($ENV{skip_lib_check});
# Write out the Makefile
Index: Krb5-1.8/Makefile.PL
--- Krb5-1.8/Makefile.PL.orig 2008-03-16 15:59:50 +0100
+++ Krb5-1.8/Makefile.PL 2008-03-17 08:08:40 +0100
Index: Krb5-1.9/Makefile.PL
--- Krb5-1.9/Makefile.PL.orig 2008-03-16 15:59:50 +0100
+++ Krb5-1.9/Makefile.PL 2010-01-05 11:23:36 +0100
@@ -37,3 +37,4 @@
'DEFINE' => '',
'INC' => "-I${KRB5_INCDIR} $KRB5_EXTRAINCS"

4
perl-kerberos/perl-kerberos.spec
Unescape View File

@ -23,7 +23,7 @@
# versions of individual parts
%define V_perl 5.10
%define V_authen_krb5 1.8
%define V_authen_krb5 1.9
%define V_authen_krb5_admin 0.11
%define V_authen_krb5_simple 0.42
%define V_authen_krb5_easy 0.90
@ -40,7 +40,7 @@ Class: EVAL
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
Release: 20090904
Release: 20100105
# list of sources
Source0: http://www.cpan.org/authors/id/J/JH/JHORWITZ/Krb5-%{V_authen_krb5}.tar.gz

55
png/png.patch
Unescape View File

@ -1,7 +1,33 @@
Index: libpng-config.in
--- libpng-config.in.orig 2010-01-03 06:05:36 +0100
+++ libpng-config.in 2010-01-05 10:18:54 +0100
@@ -16,8 +16,8 @@
exec_prefix="@exec_prefix@"
libdir="@libdir@"
includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
+libs="-lpng"
+all_libs="-lpng -lz @LIBS@"
I_opts="-I${includedir}"
L_opts="-L${libdir}"
R_opts=""
Index: libpng.pc.in
--- libpng.pc.in.orig 2010-01-03 06:05:36 +0100
+++ libpng.pc.in 2010-01-05 10:18:04 +0100
@@ -6,6 +6,6 @@
Name: libpng
Description: Loads and saves PNG files
Version: @PNGLIB_VERSION@
-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-Libs.private: @LIBS@
+Libs: -L${libdir} -lpng
+Libs.private: -lz @LIBS@
Cflags: -I${includedir}
Index: pngconf.h
--- pngconf.h.orig 2009-05-07 18:05:28 +0200
+++ pngconf.h 2009-05-08 10:22:24 +0200
@@ -331,9 +331,9 @@
--- pngconf.h.orig 2010-01-03 06:05:36 +0100
+++ pngconf.h 2010-01-05 10:18:04 +0100
@@ -360,9 +360,9 @@
# ifdef _SETJMP_H
/* If you encounter a compiler error here, see the explanation
* near the end of INSTALL.
@ -12,26 +38,3 @@ Index: pngconf.h
# endif
# endif /* __linux__ */
# endif /* PNG_SKIP_SETJMP_CHECK */
Index: scripts/libpng.pc-configure.in
--- scripts/libpng.pc-configure.in.orig 2008-05-29 19:39:19 +0200
+++ scripts/libpng.pc-configure.in 2009-05-08 10:21:50 +0200
@@ -6,6 +6,6 @@
Name: libpng
Description: Loads and saves PNG files
Version: @PNGLIB_VERSION@
-Libs: -L${libdir} -lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-Libs.private: @LIBS@
+Libs: -L${libdir} -lpng
+Libs.private: -lz @LIBS@
Cflags: -I${includedir} @LIBPNG_NO_MMX@
Index: scripts/libpng.pc.in
--- scripts/libpng.pc.in.orig 2009-05-07 18:05:35 +0200
+++ scripts/libpng.pc.in 2009-05-08 10:21:50 +0200
@@ -6,5 +6,6 @@
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.41
-Libs: -L${libdir} -lpng12
+Libs: -L${libdir} -lpng
+Libs.private: -lz
Cflags: -I${includedir}

6
png/png.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: BASE
Group: Graphics
License: BSD
Version: 1.2.41
Release: 20091203
Version: 1.4.0
Release: 20100105
# list of sources
Source0: http://switch.dl.sourceforge.net/sourceforge/libpng/libpng-%{version}.tar.gz
@ -77,7 +77,7 @@ AutoReqProv: no
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--with-libpng-compat \
--with-binconfigs \
--disable-shared
%{l_make} %{l_mflags}

4
python-text/python-text.spec
Unescape View File

@ -23,7 +23,7 @@
# package versions
%define V_python 2.5
%define V_pygments 1.1.1
%define V_pygments 1.2.2
# package information
Name: python-text
@ -36,7 +36,7 @@ Class: BASE
Group: Language
License: GPL
Version: %{V_python}
Release: 20090915
Release: 20100105
# list of sources
Source0: http://pypi.python.org/packages/source/P/Pygments/Pygments-%{V_pygments}.tar.gz

18
rsync/rsync.patch
Unescape View File

@ -1,6 +1,6 @@
Index: Makefile.in
--- Makefile.in.orig 2008-11-16 00:32:02 +0100
+++ Makefile.in 2008-12-29 09:06:40 +0100
--- Makefile.in.orig 2009-12-13 02:22:43 +0100
+++ Makefile.in 2010-01-05 11:58:10 +0100
@@ -13,6 +13,7 @@
CPPFLAGS=@CPPFLAGS@
EXEEXT=@EXEEXT@
@ -12,16 +12,16 @@ Index: Makefile.in
@@ -175,7 +176,7 @@
@if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
- perl $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
+ $(PERL) $(srcdir)/mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
man: rsync.1 rsyncd.conf.5
@if test -f rsync.1; then :; else cp -p $(srcdir)/rsync.1 .; fi
Index: compat.c
--- compat.c.orig 2008-08-02 16:04:54 +0200
+++ compat.c 2008-12-29 09:06:40 +0100
@@ -164,19 +164,21 @@
--- compat.c.orig 2009-12-21 23:40:41 +0100
+++ compat.c 2010-01-05 11:49:22 +0100
@@ -166,19 +166,21 @@
rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n",
am_server? "Server" : "Client", remote_protocol, protocol_version);
}
@ -51,9 +51,9 @@ Index: compat.c
}
if (protocol_version > PROTOCOL_VERSION) {
Index: rsync.h
--- rsync.h.orig 2008-09-27 06:21:52 +0200
+++ rsync.h 2008-12-29 09:06:40 +0100
@@ -114,9 +114,12 @@
--- rsync.h.orig 2009-12-23 20:36:27 +0100
+++ rsync.h 2010-01-05 11:49:22 +0100
@@ -115,9 +115,12 @@
* unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
* MAX_PROTOCOL_VERSION. */

4
rsync/rsync.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: CORE
Group: Filesystem
License: GPL
Version: 3.0.6
Release: 20090509
Version: 3.0.7
Release: 20100105
# package options
%option with_iconv no

6
seed7/seed7.spec
Unescape View File

@ -22,8 +22,8 @@
##
# package version
%define V_opkg 05.20091220
%define V_dist 05_20091220
%define V_opkg 05.20100103
%define V_dist 05_20100103
# package information
Name: seed7
@ -36,7 +36,7 @@ Class: EVAL
Group: Language
License: LGPL
Version: %{V_opkg}
Release: 20091221
Release: 20100105
# list of sources
Source0: http://switch.dl.sourceforge.net/seed7/seed7_%{V_dist}.tgz

4
statsvn/statsvn.spec
Unescape View File

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: SCM
License: LGPL
Version: 0.5.0
Release: 20090608
Version: 0.7.0
Release: 20100105
# list of sources
Source0: http://switch.dl.sourceforge.net/statsvn/statsvn-%{version}.zip

Write Preview
Loading…
Cancel
Save