changeset
Import package vendor original specs for necessary manipulations.
Mon, 10 Jan 2011 20:54:01 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Mon, 10 Jan 2011 20:54:01 +0100
- changeset 303
- 2bd9bf3f6f03
- parent 302
- d34fd1d7fa3e
- child 304
- fbf6cb91be09
Import package vendor original specs for necessary manipulations.
| gnupg/gnupg.spec | file | annotate | diff | comparison | revisions | |
| jabberd/jabberd.patch | file | annotate | diff | comparison | revisions | |
| jabberd/jabberd.spec | file | annotate | diff | comparison | revisions | |
| json/json.patch | file | annotate | diff | comparison | revisions | |
| json/json.spec | file | annotate | diff | comparison | revisions | |
| openpkg/openpkg.spec | file | annotate | diff | comparison | revisions | |
| openpkg/rpmmacros | file | annotate | diff | comparison | revisions |
1.1 --- a/gnupg/gnupg.spec Wed Nov 24 14:48:04 2010 +0100 1.2 +++ b/gnupg/gnupg.spec Mon Jan 10 20:54:01 2011 +0100 1.3 @@ -32,7 +32,7 @@ 1.4 Group: PGP 1.5 License: GPL 1.6 Version: 2.0.16 1.7 -Release: 20101020 1.8 +Release: 20101026 1.9 1.10 # package options 1.11 %option with_curl yes 1.12 @@ -162,17 +162,19 @@ 1.13 %install 1.14 # install program 1.15 rm -rf $RPM_BUILD_ROOT 1.16 - %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 1.17 + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT 1.18 1.19 - # provide unversioned names 1.20 - ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \ 1.21 - $RPM_BUILD_ROOT%{l_prefix}/bin/gpg 1.22 - ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \ 1.23 - $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv 1.24 - ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \ 1.25 - $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1 1.26 - ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \ 1.27 - $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1 1.28 + # MSvB: facilitate PATH order of independent 1.29 + # MSvB: GnuPG v1 and GnuPG v2 installations. 1.30 +# # provide unversioned names 1.31 +# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpg2 \ 1.32 +# $RPM_BUILD_ROOT%{l_prefix}/bin/gpg 1.33 +# ln $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv2 \ 1.34 +# $RPM_BUILD_ROOT%{l_prefix}/bin/gpgv 1.35 +# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg2.1 \ 1.36 +# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpg.1 1.37 +# ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv2.1 \ 1.38 +# $RPM_BUILD_ROOT%{l_prefix}/man/man1/gpgv.1 1.39 1.40 # strip down and post-adjust installation files 1.41 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true 1.42 @@ -187,8 +189,9 @@ 1.43 # determine installation files 1.44 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 1.45 %{l_files_std} \ 1.46 - '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' \ 1.47 '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' 1.48 +# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg2' \ 1.49 +# '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg' 1.50 1.51 %files -f files 1.52
2.1 --- a/jabberd/jabberd.patch Wed Nov 24 14:48:04 2010 +0100 2.2 +++ b/jabberd/jabberd.patch Mon Jan 10 20:54:01 2011 +0100 2.3 @@ -23,7 +23,7 @@ 2.4 </log> 2.5 2.6 <!-- Local network configuration --> 2.7 -@@ -137,7 +135,7 @@ 2.8 +@@ -149,7 +147,7 @@ 2.9 <id password-change='true' /> --> 2.10 2.11 <!-- IP address to bind to (default: 0.0.0.0) --> 2.12 @@ -141,7 +141,7 @@ 2.13 Index: sm/mod_roster.c 2.14 --- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200 2.15 +++ sm/mod_roster.c 2009-06-30 20:45:06 +0200 2.16 -@@ -635,6 +635,9 @@ 2.17 +@@ -708,6 +708,9 @@ 2.18 if(user->sessions == NULL) 2.19 return mod_PASS; 2.20
3.1 --- a/jabberd/jabberd.spec Wed Nov 24 14:48:04 2010 +0100 3.2 +++ b/jabberd/jabberd.spec Mon Jan 10 20:54:01 2011 +0100 3.3 @@ -23,7 +23,7 @@ 3.4 3.5 # package version 3.6 %define V_major 2.2 3.7 -%define V_minor 9 3.8 +%define V_minor 11 3.9 %define V_mucon 0.8 3.10 3.11 # package information
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/json/json.patch Mon Jan 10 20:54:01 2011 +0100 4.3 @@ -0,0 +1,11 @@ 4.4 +Index: zzjson-1.1.0/src/zzjson_parse.c 4.5 +--- zzjson-1.1.0/src/zzjson_parse.c.orig 2009-08-16 02:49:38 +0200 4.6 ++++ zzjson-1.1.0/src/zzjson_parse.c 2009-11-18 19:49:55 +0100 4.7 +@@ -9,6 +9,7 @@ 4.8 + #include <math.h> 4.9 + #include <stdio.h> 4.10 + 4.11 ++#undef getchar 4.12 + #define GETC() config->getchar(config->ihandle) 4.13 + #define UNGETC(c) config->ungetchar(c, config->ihandle) 4.14 + #define SKIPWS() skipws(config)
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/json/json.spec Mon Jan 10 20:54:01 2011 +0100 5.3 @@ -0,0 +1,221 @@ 5.4 +## 5.5 +## json.spec -- OpenPKG RPM Package Specification 5.6 +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/> 5.7 +## 5.8 +## Permission to use, copy, modify, and distribute this software for 5.9 +## any purpose with or without fee is hereby granted, provided that 5.10 +## the above copyright notice and this permission notice appear in all 5.11 +## copies. 5.12 +## 5.13 +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 5.14 +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 5.15 +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 5.16 +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR 5.17 +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 5.18 +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 5.19 +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 5.20 +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 5.21 +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 5.22 +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 5.23 +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 5.24 +## SUCH DAMAGE. 5.25 +## 5.26 + 5.27 +# package version 5.28 +%define V_api_c 0.9 5.29 +%define V_api_c2 1.1.0 5.30 +%define V_api_c3 0.3 5.31 +%define V_api_pl1 2.16 5.32 +%define V_api_pl2 0.03 5.33 +%define V_api_pl3 0.39 5.34 +%define V_api_pl4 2.2311 5.35 +%define V_api_pl5 0.011 5.36 +%define V_api_js1 20090929 5.37 +%define V_api_js2 20090929 5.38 + 5.39 +# package information 5.40 +Name: json 5.41 +Summary: JavaScript Object Notation (JSON) 5.42 +URL: http://www.json.org/ 5.43 +Vendor: D. Crockford et al. 5.44 +Packager: OpenPKG Foundation e.V. 5.45 +Distribution: OpenPKG Community 5.46 +Class: PLUS 5.47 +Group: Language 5.48 +License: Open Source 5.49 +Version: %{V_api_js2} 5.50 +Release: 20091118 5.51 + 5.52 +# list of sources 5.53 +Source0: http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz 5.54 +Source1: http://switch.dl.sourceforge.net/zzjson/zzjson-%{V_api_c2}.tar.gz 5.55 +Source2: http://projects.snarc.org/libjson/download/libjson-%{V_api_c3}.tar.bz2 5.56 +Source3: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-%{V_api_pl1}.tar.gz 5.57 +Source4: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/JSON-PC-%{V_api_pl2}.tar.gz 5.58 +Source5: http://www.cpan.org/authors/id/D/DO/DOWENS/JSON-DWIW-%{V_api_pl3}.tar.gz 5.59 +Source6: http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{V_api_pl4}.tar.gz 5.60 +Source7: http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_api_pl5}.tar.gz 5.61 +Source8: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js1}.js 5.62 +Source9: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json2-%{V_api_js2}.js 5.63 +Source10: http://www.ietf.org/rfc/rfc4627.txt 5.64 +Patch0: json.patch 5.65 + 5.66 +# build information 5.67 +Prefix: %{l_prefix} 5.68 +BuildRoot: %{l_buildroot} 5.69 +BuildPreReq: OpenPKG, openpkg >= 20040130, perl, perl-openpkg, make 5.70 +PreReq: OpenPKG, openpkg >= 20040130, perl 5.71 +AutoReq: no 5.72 +AutoReqProv: no 5.73 + 5.74 +%description 5.75 + JSON (JavaScript Object Notation) is a lightweight data-interchange 5.76 + format. It is easy for humans to read and write. It is easy for 5.77 + machines to parse and generate. It is based on a subset of the 5.78 + JavaScript Programming Language, Standard ECMA-262 3rd Edition. 5.79 + JSON is a text format that is completely language independent but 5.80 + uses conventions that are familiar to programmers of the C-family 5.81 + of languages. These properties make JSON an ideal data-interchange 5.82 + language. 5.83 + 5.84 +%track 5.85 + prog json:json-c = { 5.86 + version = %{V_api_c} 5.87 + url = http://oss.metaparadigm.com/json-c/ 5.88 + regex = json-c-(__VER__)\.tar\.gz 5.89 + } 5.90 + prog json:json-c2 = { 5.91 + version = %{V_api_c2} 5.92 + url = http://sourceforge.net/projects/zzjson/files/ 5.93 + regex = zzjson-(__VER__)\.tar\.gz 5.94 + } 5.95 + prog json:json-c3 = { 5.96 + version = %{V_api_c3} 5.97 + url = http://projects.snarc.org/libjson/download/ 5.98 + regex = libjson-(__VER__)\.tar\.bz2 5.99 + } 5.100 + prog json:json-pl1 = { 5.101 + version = %{V_api_pl1} 5.102 + url = http://www.cpan.org/authors/id/M/MA/MAKAMAKA/ 5.103 + regex = JSON-(__VER__)\.tar\.gz 5.104 + } 5.105 + prog json:json-pl2 = { 5.106 + version = %{V_api_pl2} 5.107 + url = http://www.cpan.org/authors/id/M/MA/MAKAMAKA/ 5.108 + regex = JSON-PC-(__VER__)\.tar\.gz 5.109 + } 5.110 + prog json:json-pl3 = { 5.111 + version = %{V_api_pl3} 5.112 + url = http://www.cpan.org/authors/id/D/DO/DOWENS/ 5.113 + regex = JSON-DWIW-(__VER__)\.tar\.gz 5.114 + } 5.115 + prog json:json-pl4 = { 5.116 + version = %{V_api_pl4} 5.117 + url = http://www.cpan.org/authors/id/M/ML/MLEHMANN/ 5.118 + regex = JSON-XS-(__VER__)\.tar\.gz 5.119 + } 5.120 + prog json:json-pl5 = { 5.121 + version = %{V_api_pl5} 5.122 + url = http://www.cpan.org/authors/id/P/PE/PERLER/ 5.123 + regex = JavaScript-Dumper-(__VER__)\.tar\.gz 5.124 + } 5.125 + prog json:json-js1 = { 5.126 + version = %{V_api_js1} 5.127 + url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/ 5.128 + regex = json-(__VER__)\.js 5.129 + } 5.130 + prog json:json-js2 = { 5.131 + version = %{V_api_js2} 5.132 + url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/ 5.133 + regex = json2-(__VER__)\.js 5.134 + } 5.135 + 5.136 +%prep 5.137 + %setup -q -c 5.138 + %setup -q -T -D -a 1 5.139 + %setup -q -T -D -a 2 5.140 + %setup -q -T -D -a 3 5.141 + %setup -q -T -D -a 4 5.142 + %setup -q -T -D -a 5 5.143 + %setup -q -T -D -a 6 5.144 + %setup -q -T -D -a 7 5.145 + cp %{SOURCE json-%{V_api_js1}.js} json.js 5.146 + cp %{SOURCE json2-%{V_api_js2}.js} json2.js 5.147 + %patch -p0 5.148 + 5.149 +%build 5.150 + ( cd json-c-%{V_api_c} 5.151 + CC="%{l_cc}" \ 5.152 + CFLAGS="%{l_cflags -O}" \ 5.153 + ./configure \ 5.154 + --prefix=%{l_prefix} \ 5.155 + --disable-shared 5.156 + %{l_make} %{l_mflags -O} 5.157 + ) || exit $? 5.158 + ( cd zzjson-%{V_api_c2} 5.159 + CC="%{l_cc}" \ 5.160 + %{l_bash} ./buildstatic.sh 5.161 + ) || exit $? 5.162 + ( cd libjson-%{V_api_c3} 5.163 + %{l_make} %{l_mflags} \ 5.164 + CC="%{l_cc}" \ 5.165 + CFLAGS="%{l_cflags -O}" \ 5.166 + libjson.a 5.167 + ) || exit $? 5.168 + %{l_prefix}/bin/perl-openpkg prepare 5.169 + %{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl1} configure build 5.170 + %{l_prefix}/bin/perl-openpkg -d JSON-PC-%{V_api_pl2} configure build 5.171 + %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl3} configure build 5.172 + %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl4} configure build 5.173 + %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl5} configure build 5.174 + 5.175 +%install 5.176 + rm -rf $RPM_BUILD_ROOT 5.177 + ( cd json-c-%{V_api_c} 5.178 + %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" 5.179 + ) || exit $? 5.180 + ( cd zzjson-%{V_api_c2} 5.181 + %{l_shtool} install -c -m 644 \ 5.182 + include/zzjson.h $RPM_BUILD_ROOT%{l_prefix}/include/ 5.183 + %{l_shtool} install -c -m 644 \ 5.184 + lib/libzzjson.a $RPM_BUILD_ROOT%{l_prefix}/lib/ 5.185 + ) || exit $? 5.186 + ( cd libjson-%{V_api_c3} 5.187 + %{l_shtool} install -c -m 644 \ 5.188 + json.h $RPM_BUILD_ROOT%{l_prefix}/include/ 5.189 + %{l_shtool} install -c -m 644 \ 5.190 + libjson.a $RPM_BUILD_ROOT%{l_prefix}/lib/ 5.191 + ) || exit $? 5.192 + %{l_shtool} mkdir -f -p -m 755 \ 5.193 + $RPM_BUILD_ROOT%{l_prefix}/share/json 5.194 + %{l_shtool} install -c -m 644 \ 5.195 + json.js json2.js $RPM_BUILD_ROOT%{l_prefix}/share/json/ 5.196 + %{l_shtool} install -c -m 644 \ 5.197 + %{SOURCE rfc4627.txt} $RPM_BUILD_ROOT%{l_prefix}/share/json/ 5.198 + %{l_shtool} mkdir -f -p -m 755 \ 5.199 + $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d 5.200 + ( echo "Alias /openpkg-json/ %{l_prefix}/share/json/" 5.201 + echo "<Directory %{l_prefix}/share/json/>" 5.202 + echo " Options Indexes" 5.203 + echo " AllowOverride none" 5.204 + echo " Order allow,deny" 5.205 + echo " Allow from all" 5.206 + echo "</Directory>" 5.207 + ) >json.conf 5.208 + %{l_shtool} install -c -m 644 \ 5.209 + json.conf $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d/ 5.210 + %{l_prefix}/bin/perl-openpkg -d JSON-%{V_api_pl1} install 5.211 + %{l_prefix}/bin/perl-openpkg -d JSON-PC-%{V_api_pl2} install 5.212 + %{l_prefix}/bin/perl-openpkg -d JSON-DWIW-%{V_api_pl3} install 5.213 + %{l_prefix}/bin/perl-openpkg -d JSON-XS-%{V_api_pl4} install 5.214 + %{l_prefix}/bin/perl-openpkg -d JavaScript-Dumper-%{V_api_pl5} install 5.215 + %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup 5.216 + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 5.217 + %{l_files_std} `cat perl-openpkg-files` \ 5.218 + '%config %{l_prefix}/etc/apache/apache.d/*' 5.219 + 5.220 +%files -f files 5.221 + 5.222 +%clean 5.223 + rm -rf $RPM_BUILD_ROOT 5.224 +
6.1 --- a/openpkg/openpkg.spec Wed Nov 24 14:48:04 2010 +0100 6.2 +++ b/openpkg/openpkg.spec Mon Jan 10 20:54:01 2011 +0100 6.3 @@ -39,7 +39,7 @@ 6.4 # o any cc(1) 6.5 6.6 # the package version/release 6.7 -%define V_openpkg 20100826 6.8 +%define V_openpkg 20101018 6.9 6.10 # the used software versions 6.11 %define V_rpm 4.2.1 6.12 @@ -981,6 +981,11 @@ 6.13 --disable-rpath \ 6.14 --disable-nls 6.15 6.16 + # deny automatic dependency calculations 6.17 + rm -f find-provides find-requires 6.18 + ln -s autodeps/none find-provides 6.19 + ln -s autodeps/none find-requires 6.20 + 6.21 # build the package 6.22 ${l_make} 6.23 ) || exit $? 6.24 @@ -1125,12 +1130,12 @@ 6.25 rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/lib >/dev/null 2>&1 || true 6.26 for file in \ 6.27 u_pkg.sh vpkg-provides.sh vpkg-provides2.sh rpmdiff.cgi rpmdiff \ 6.28 - perl.prov perl.req mkinstalldirs magic.prov magic.req http.req \ 6.29 - getpo.sh get_magic.pl find-provides find-requires \ 6.30 - find-requires.perl find-req.pl find-provides.perl \ 6.31 - find-prov.pl find-lang.sh cpanflute convertrpmrc.sh check-prereqs \ 6.32 - rpmputtext rpmgettext brp-compress brp-redhat brp-sparc64-linux \ 6.33 - brp-strip brp-strip-shared brp-strip-comment-note rpmrc \ 6.34 + mkinstalldirs magic.prov magic.req http.req getpo.sh \ 6.35 + get_magic.pl find-provides find-requires find-requires.perl \ 6.36 + find-req.pl find-provides.perl find-prov.pl find-lang.sh \ 6.37 + cpanflute convertrpmrc.sh check-prereqs rpmputtext rpmgettext \ 6.38 + brp-compress brp-redhat brp-sparc64-linux brp-strip \ 6.39 + brp-strip-shared brp-strip-comment-note rpmrc \ 6.40 config.guess config.sub check-files; do 6.41 rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file >/dev/null 2>&1 || true 6.42 done
7.1 --- a/openpkg/rpmmacros Wed Nov 24 14:48:04 2010 +0100 7.2 +++ b/openpkg/rpmmacros Mon Jan 10 20:54:01 2011 +0100 7.3 @@ -220,6 +220,14 @@ 7.4 %__debug_install_post %{nil} 7.5 %_unpackaged_files_terminate_build 0 7.6 7.7 +# override automatic dependency generation 7.8 +%_use_internal_dependency_generator 0 7.9 +%__find_provides %{nil} 7.10 +%__find_requires %{nil} 7.11 +%__find_prereq %{nil} 7.12 +%__perl_provides %{nil} 7.13 +%__perl_requires %{nil} 7.14 + 7.15 # provide fixed paths to tools (standard) 7.16 %_gzipbin %{l_prefix}/lib/openpkg/gzip 7.17 %_bzip2bin %{l_prefix}/lib/openpkg/bzip2
