[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
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: 22-Jun-2006 09:32:17
Branch: HEAD Handle: 2006062208321301
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
do not rely on the smartness of RPM to not expand %x when we
actually meant %%x
Summary:
RevisionChanges Path
1.340 +1 -0 openpkg-src/openpkg/HISTORY
1.493 +1 -1 openpkg-src/openpkg/openpkg.spec
1.76+5 -5 openpkg-src/openpkg/rpmmacros
patch -p0 '@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.339 -r1.340 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Jun 2006 15:21:04 - 1.339
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 07:32:13 - 1.340
@@ -2,6 +2,7 @@
2006
+20060622 do not rely on RPM's smartness to not expand %x when we actually
meant %%x
20060621 use new openpkg release for openpkg install and openpkg build
commands
20060621 use new openpkg release for %{l_openpkg_release} macro
20060621 added openpkg release command for more precise OpenPKG
distribution tag and URL determination
@@ .
patch -p0 '@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.492 -r1.493 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Jun 2006 15:21:04 - 1.492
+++ openpkg-src/openpkg/openpkg.spec 22 Jun 2006 07:32:13 - 1.493
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060621
+%define V_openpkg 20060622
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 '@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.75 -r1.76 rpmmacros
--- openpkg-src/openpkg/rpmmacros 21 Jun 2006 15:21:05 - 1.75
+++ openpkg-src/openpkg/rpmmacros 22 Jun 2006 07:32:14 - 1.76
@@ -26,7 +26,7 @@
##
# the OpenPKG release identification (for the current package or as a
fallback for the bootstrap package)
-%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release=%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}
%{?-F:-F %(echo %{-F*} | sed -e 's/%s/%t/g')}%{!?-F:-F OpenPKG-%t})
+%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release=%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}
%{?-F:-F %(echo %{-F*} | sed -e 's/%%s/%%t/g')}%{!?-F:-F OpenPKG-%%t})
# the OpenPKG OIDs (root is officially registered at IANA)
%l_openpkg_oid 1.3.6.1.4.1.18749
@@ -42,8 +42,8 @@
%l_tag_fmt_opt %(uuid_ns=`%{l_uuid} -v3 ns:OID
%{l_openpkg_oid_tagfmtopt}`; %{l_uuid} -v3 $uuid_ns '%{?_options}')
%l_tag_fmt_uuid %(%{l_uuid} -v1)
%l_tag_fmt_time %(date '+%%Y%%m%%d%%H%%M%%S')
-%l_tag_fmt_user %(%{l_shtool} echo -e '%u')
-%l_tag_fmt_host %(%{l_shtool} echo -e '%h%d')
+%l_tag_fmt_user %(%{l_shtool} echo -e '%%u')
+%l_tag_fmt_host %(%{l_shtool} echo -e '%%h%%d')
%l_tag_gen %{expand:%(echo '%{l_tag_fmt}' | sed -e
's/\\([a-zA-Z][_a-zA-Z0-9]*\\)/%%{l_tag_fmt_\\1}/g')}
%l_tag %(echo %{l_tag_gen} | sed -e 's;-;;g')
@@ -281,9 +281,9 @@
%l_whoami%((id -un) 2/dev/null || (whoami) 2/dev/null ||
(who am i | cut -d -f1) 2/dev/null || echo $LOGNAME)
# macros for dynamically generating a %files list
-%l_files_defattr '%defattr(-,%{l_musr},%{l_mgrp})'
+%l_files_defattr '%%defattr(-,%{l_musr},%{l_mgrp})'
%l_files_all '%{l_prefix}'
-%l_files_noshared'%not %dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
+%l_files_noshared'%%not %%dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
%l_files_std() %l_files_defattr %l_files_all %l_files_noshared
# path to local build root
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg/ HISTORY build.sh...
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: 22-Jun-2006 09:36:35
Branch: OPENPKG_2_STABLE Handle: 2006062208363102
Added files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg release.8 release.pod release.sh
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY build.sh install.sh lsync.8 openpkg.1
openpkg.spec pod2man.sh rc rc.8 rpm-config.8
rpmmacros rpmtool.8 uuid.8
Log:
MFC: all changes from CURRENT up to 20060622
Summary:
RevisionChanges Path
1.337.2.1 +5 -0 openpkg-src/openpkg/HISTORY
1.2.2.1 +20 -23 openpkg-src/openpkg/build.sh
1.9.2.1 +12 -17 openpkg-src/openpkg/install.sh
1.6.12.1+6 -6 openpkg-src/openpkg/lsync.8
1.2.10.1+1 -1 openpkg-src/openpkg/openpkg.1
1.490.2.2 +11 -1 openpkg-src/openpkg/openpkg.spec
1.4.12.1+1 -0 openpkg-src/openpkg/pod2man.sh
1.62.2.1+1 -1 openpkg-src/openpkg/rc
1.6.10.1+1 -1 openpkg-src/openpkg/rc.8
1.1.2.2 +219 -0 openpkg-src/openpkg/release.8
1.1.2.2 +122 -0 openpkg-src/openpkg/release.pod
1.1.2.2 +139 -0 openpkg-src/openpkg/release.sh
1.3.12.1+1 -1 openpkg-src/openpkg/rpm-config.8
1.74.2.1+5 -5 openpkg-src/openpkg/rpmmacros
1.9.12.1+1 -1 openpkg-src/openpkg/rpmtool.8
1.1.14.1+1 -1 openpkg-src/openpkg/uuid.8
patch -p0 '@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.337 -r1.337.2.1 HISTORY
--- openpkg-src/openpkg/HISTORY 19 Jun 2006 09:54:00 - 1.337
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 07:36:31 -
1.337.2.1
@@ -2,6 +2,11 @@
2006
+20060622 do not rely on RPM's smartness to not expand %x when we actually
meant %%x
+20060621 use new openpkg release for openpkg install and openpkg build
commands
+20060621 use new openpkg release for %{l_openpkg_release} macro
+20060621 added openpkg release command for more precise OpenPKG
distribution tag and URL determination
+20060621 complain also about .rpmsave/.rpmnew files if it is a symbolic link
(usually created manually)
20060619 downgrade to cURL 7.15.3 til a suitable solution for long
line-capable 'grep -e' is found
20060619 backout SMF and revert to classic System V init style on Solaris 10
due to complete brokenness
20060618 support bootstrap Release: tags for N-STABLE branches
(N.YYYMMDD)
@@ .
patch -p0 '@@ .'
Index: openpkg-src/openpkg/build.sh
$ cvs diff -u -r1.2 -r1.2.2.1 build.sh
--- openpkg-src/openpkg/build.sh 17 May 2006 07:35:30 - 1.2
+++ openpkg-src/openpkg/build.sh 22 Jun 2006 07:36:31 - 1.2.2.1
@@ -28,33 +28,27 @@
## in order to bootstrap the installation of the OpenPKG Tool Chain.
##
-# determine OpenPKG release and download URLs
-release=`$OPENPKG_PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release -F
%s}'`
-case $release in
-CURRENT )
-url_src=ftp://ftp.openpkg.org/current/SRC;
-url_upd=
-;;
-[0-9].[0-9] )
-url_src=ftp://ftp.openpkg.org/release/$release/SRC;
-url_upd=ftp://ftp.openpkg.org/release/$release/UPD;
-;;
-* )
-echo openpkg:ERROR: invalid OpenPKG release \$release\ 12
-exit 1
-;;
-esac
+# determine OpenPKG distribution URLs (part 1)
+url_raw=`$OPENPKG_PREFIX/bin/openpkg release --fmt=%u`
+url_src=
+url_upd=
-# mimimum command line option parsing
+# minimum command line option parsing
while [ $# -gt 0 ]; do
case $1 in
--r ) shift; url_src=$1; url_upd=; shift ;;
--r* ) url_src=${1/-r/}; url_upd= shift ;;
+-r ) shift; url_raw=$1; shift ;;
+-r* ) url_raw=${1/-r/}; shift ;;
* ) break ;;
esac
done
-case $url_src in
-/* ) url_src=file://$url_src ;;
+case $url_raw in
+/* ) url_raw=file://$url_raw ;;
+esac
+
+# determine OpenPKG distribution URLs (part 2)
+case $url_raw in
+*/SRC ) ;;
+* ) url_src=$url_raw/SRC; url_upd=$url_raw/UPD ;;
esac
# sanity check usage
@@ -78,7 +72,7 @@
# determine latest package version and URL
pkg_srpm=
pkg_name=
-for url in $url_upd $url_src; do
+for url in $url_upd
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.boot
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: 22-Jun-2006 10:01:40
Branch: HEAD Handle: 2006062209013700
Modified files:
openpkg-src/openpkg HISTORY openpkg.boot
Log:
replace release tag fiddling in openpkg.boot with openpkg release
functionality, too.
Summary:
RevisionChanges Path
1.341 +1 -0 openpkg-src/openpkg/HISTORY
1.59+3 -24 openpkg-src/openpkg/openpkg.boot
patch -p0 '@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.340 -r1.341 HISTORY
--- openpkg-src/openpkg/HISTORY 22 Jun 2006 07:32:13 - 1.340
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 08:01:37 - 1.341
@@ -2,6 +2,7 @@
2006
+20060622 replace release tag fiddling in openpkg.boot with openpkg release
functionality, too.
20060622 do not rely on RPM's smartness to not expand %x when we actually
meant %%x
20060621 use new openpkg release for openpkg install and openpkg build
commands
20060621 use new openpkg release for %{l_openpkg_release} macro
@@ .
patch -p0 '@@ .'
Index: openpkg-src/openpkg/openpkg.boot
$ cvs diff -u -r1.58 -r1.59 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 12 May 2006 14:35:05 - 1.58
+++ openpkg-src/openpkg/openpkg.boot 22 Jun 2006 08:01:37 - 1.59
@@ -194,18 +194,7 @@
sh $tmpdir/.sh
rm -f $tmpdir/.sh
l_version=$release
-case ${l_version} in
-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
-l_release=CURRENT
-;;
-* )
-l_release=`echo ${l_version} |\
-sed -e 's;^;#;' \
--e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
--e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
--e 's;^#.*;UNKNOWN;'`
-;;
-esac
+l_release=`sh ./release.sh -r ${l_version} -F %t`
sed $srcdir/aux.wrapsrc.sh $tmpdir/openpkg.boot.tmp \
-e s;@l_dir@;$name-$version-$release.src; \
-e s;@l_release@;$l_release; \
@@ -524,18 +513,8 @@
$RPM_BUILD_ROOT$prefix/openpkg.bzip2
l_platform=`$tmpdir/rpm --eval '%{l_platform -p}'`
l_version=`$tmpdir/rpm -q --qf '%{version}' openpkg`
-case ${l_version} in
-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
-l_release=CURRENT
-;;
-* )
-l_release=`echo ${l_version} |\
-sed -e 's;^;#;' \
--e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
--e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
--e 's;^#.*;UNKNOWN;'`
-;;
-esac
+release_sh=`SOURCE release.sh`
+l_release=`sh $release_sh -r $l_version -F %t`
cat $spec |\
sed -e /^%pre$/,/^%/ p -e 'd' |\
sed -e '/^%/d' -e 's/^ //' |\
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg/ HISTORY openpkg....
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: 22-Jun-2006 10:05:09
Branch: OPENPKG_2_STABLE Handle: 2006062209050601
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/openpkg HISTORY openpkg.boot
Log:
MFC: replace release tag fiddling in openpkg.boot with openpkg
release functionality, too.
Summary:
RevisionChanges Path
1.337.2.2 +1 -0 openpkg-src/openpkg/HISTORY
1.58.2.1+3 -24 openpkg-src/openpkg/openpkg.boot
patch -p0 '@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.337.2.1 -r1.337.2.2 HISTORY
--- openpkg-src/openpkg/HISTORY 22 Jun 2006 07:36:31 -
1.337.2.1
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 08:05:06 -
1.337.2.2
@@ -2,6 +2,7 @@
2006
+20060622 replace release tag fiddling in openpkg.boot with openpkg release
functionality, too.
20060622 do not rely on RPM's smartness to not expand %x when we actually
meant %%x
20060621 use new openpkg release for openpkg install and openpkg build
commands
20060621 use new openpkg release for %{l_openpkg_release} macro
@@ .
patch -p0 '@@ .'
Index: openpkg-src/openpkg/openpkg.boot
$ cvs diff -u -r1.58 -r1.58.2.1 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 12 May 2006 14:35:05 - 1.58
+++ openpkg-src/openpkg/openpkg.boot 22 Jun 2006 08:05:07 - 1.58.2.1
@@ -194,18 +194,7 @@
sh $tmpdir/.sh
rm -f $tmpdir/.sh
l_version=$release
-case ${l_version} in
-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
-l_release=CURRENT
-;;
-* )
-l_release=`echo ${l_version} |\
-sed -e 's;^;#;' \
--e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
--e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
--e 's;^#.*;UNKNOWN;'`
-;;
-esac
+l_release=`sh ./release.sh -r ${l_version} -F %t`
sed $srcdir/aux.wrapsrc.sh $tmpdir/openpkg.boot.tmp \
-e s;@l_dir@;$name-$version-$release.src; \
-e s;@l_release@;$l_release; \
@@ -524,18 +513,8 @@
$RPM_BUILD_ROOT$prefix/openpkg.bzip2
l_platform=`$tmpdir/rpm --eval '%{l_platform -p}'`
l_version=`$tmpdir/rpm -q --qf '%{version}' openpkg`
-case ${l_version} in
-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
-l_release=CURRENT
-;;
-* )
-l_release=`echo ${l_version} |\
-sed -e 's;^;#;' \
--e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
--e
's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*$;\1-SOLID;' \
--e 's;^#.*;UNKNOWN;'`
-;;
-esac
+release_sh=`SOURCE release.sh`
+l_release=`sh $release_sh -r $l_version -F %t`
cat $spec |\
sed -e /^%pre$/,/^%/ p -e 'd' |\
sed -e '/^%/d' -e 's/^ //' |\
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
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: 22-Jun-2006 10:30:27
Branch: HEAD Handle: 2006062209302700
Modified files:
openpkg-src/gcc gcc.spec
Log:
upgrade to new l_openpkg_release usage and remove special with_gcc
stuff which should only exist in gccN packages
Summary:
RevisionChanges Path
1.128 +4 -30 openpkg-src/gcc/gcc.spec
patch -p0 '@@ .'
Index: openpkg-src/gcc/gcc.spec
$ cvs diff -u -r1.127 -r1.128 gcc.spec
--- openpkg-src/gcc/gcc.spec 28 May 2006 11:45:53 - 1.127
+++ openpkg-src/gcc/gcc.spec 22 Jun 2006 08:30:27 - 1.128
@@ -37,7 +37,7 @@
Group:Compiler
License: GPL
Version: %{V_full}
-Release: 20060528
+Release: 20060622
# package options
%option with_cxx yes
@@ -48,7 +48,6 @@
%option with_profile no
%option with_binutils yes
%option with_threads yes
-%option with_gcc no
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
@@ -57,8 +56,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, make
-PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: OpenPKG, openpkg = 20060622, make
+PreReq: OpenPKG, openpkg = 20060622
%if %{with_binutils} == yes
BuildPreReq: binutils = 2.14
PreReq: binutils = 2.14
@@ -73,9 +72,6 @@
%endif
AutoReq: no
AutoReqProv: no
-%if %{with_gcc} == yes
-Provides: gcc = %{version}-%{release}
-%endif
%description
The GNU Compiler Collection (GCC) provides a standard conforming and
@@ -97,7 +93,7 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
--e 's;\(VERSUFFIX \)\(\);\1 (%{l_openpkg_release -F
OpenPKG-%%s})\2;' \
+-e 's;\(VERSUFFIX \)\(\);\1 (%{l_openpkg_release -F
OpenPKG-%%t})\2;' \
-e 's;\(bug_report_url\[\] =
\)[^]*;\1URL:http://www.openpkg.org/;' \
gcc/version.c
if [ .%{V_comp} != . ]; then
@@ -303,28 +299,6 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man1/c++.1
%endif
-# resolve filename conflicts
-%if %{with_gcc} != yes %{V_comp} !=
-( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- for file in *; do
- [ .$file = .* ] continue
- mv ${file} ${file}%{V_comp}
- done
-) || exit $?
-( cd $RPM_BUILD_ROOT%{l_prefix}/info
- for file in *; do
- [ .$file = .* ] continue
- mv ${file} `echo ${file} | sed -e
's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
- done
-) || exit $?
-( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
- for file in *; do
- [ .$file = .* ] continue
- mv ${file} `echo ${file} | sed -e
's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
- done
-) || exit $?
-%endif
-
# determine installation file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache/ apache.spec openpkg-src/apache2/ ap...
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: 22-Jun-2006 10:51:14
Branch: HEAD Handle: 2006062209510607
Modified files:
openpkg-src/apache apache.spec
openpkg-src/apache2 apache2.spec
openpkg-src/gcc3gcc3.spec
openpkg-src/gcc40 gcc40.spec
openpkg-src/gcc42 gcc42.spec
openpkg-src/lighttpdlighttpd.spec
openpkg-src/muttmutt.spec
openpkg-src/ngircd ngircd.spec
openpkg-src/openpkg build.sh install.sh rpmmacros
openpkg-src/openssh openssh.spec
Log:
upgrade to the newer world order of %{l_openpkg_release} macro
Summary:
RevisionChanges Path
1.336 +4 -4 openpkg-src/apache/apache.spec
1.75+4 -4 openpkg-src/apache2/apache2.spec
1.5 +4 -4 openpkg-src/gcc3/gcc3.spec
1.45+4 -4 openpkg-src/gcc40/gcc40.spec
1.24+4 -4 openpkg-src/gcc42/gcc42.spec
1.24+4 -4 openpkg-src/lighttpd/lighttpd.spec
1.72+4 -4 openpkg-src/mutt/mutt.spec
1.8 +4 -4 openpkg-src/ngircd/ngircd.spec
1.4 +2 -1 openpkg-src/openpkg/build.sh
1.11+2 -1 openpkg-src/openpkg/install.sh
1.77+1 -1 openpkg-src/openpkg/rpmmacros
1.162 +4 -4 openpkg-src/openssh/openssh.spec
patch -p0 '@@ .'
Index: openpkg-src/apache/apache.spec
$ cvs diff -u -r1.335 -r1.336 apache.spec
--- openpkg-src/apache/apache.spec9 Jun 2006 07:43:08 - 1.335
+++ openpkg-src/apache/apache.spec22 Jun 2006 08:51:07 - 1.336
@@ -65,7 +65,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060609
+Release: 20060622
# package options (suexec related)
%option with_suexec yes
@@ -220,8 +220,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130
-PreReq: OpenPKG, openpkg = 20040130
+BuildPreReq: OpenPKG, openpkg = 20060622
+PreReq: OpenPKG, openpkg = 20060622
%if %{with_mod_ssl} == yes
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ -501,7 +501,7 @@
%setup -q -c
%patch -p0
%{l_shtool} subst \
--e 's;Unix;%{l_openpkg_release -F OpenPKG/%%s};g' \
+-e 's;Unix;%{l_openpkg_release -F OpenPKG/%%t};g' \
apache_%{V_apache}/src/os/unix/os.h
# unpack optional extension modules
@@ .
patch -p0 '@@ .'
Index: openpkg-src/apache2/apache2.spec
$ cvs diff -u -r1.74 -r1.75 apache2.spec
--- openpkg-src/apache2/apache2.spec 30 Apr 2006 08:12:12 - 1.74
+++ openpkg-src/apache2/apache2.spec 22 Jun 2006 08:51:09 - 1.75
@@ -39,7 +39,7 @@
Group:Web
License: ASF
Version: %{V_apache}
-Release: 20060430
+Release: 20060622
# package options (generic)
%option with_mpm prefork
@@ -71,8 +71,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, perl, make
-PreReq: OpenPKG, openpkg = 20040130, perl
+BuildPreReq: OpenPKG, openpkg = 20060622, perl, make
+PreReq: OpenPKG, openpkg = 20060622, perl
BuildPreReq: expat, libiconv, db
PreReq: expat, libiconv, db
%if %{with_mod_deflate} == yes
@@ -134,7 +134,7 @@
%setup -q -c
%patch -p0 -d httpd-%{V_apache}
%{l_shtool} subst \
--e 's;( PLATFORM );(%{l_openpkg_release -F OpenPKG/%%s});g' \
+-e 's;( PLATFORM );(%{l_openpkg_release -F OpenPKG/%%t});g' \
httpd-%{V_apache}/server/core.c
# unpack optional extension modules
@@ .
patch -p0 '@@ .'
Index: openpkg-src/gcc3/gcc3.spec
$ cvs diff -u -r1.4 -r1.5 gcc3.spec
--- openpkg-src/gcc3/gcc3.spec6 Mar 2006 07:14:05 - 1.4
+++ openpkg-src/gcc3/gcc3.spec22 Jun 2006 08:51:10 - 1.5
@@ -37,7 +37,7 @@
Group:Compiler
License: GPL
Version: %{V_full}
-Release: 20060306
+Release: 20060622
# package options
%option with_cxx yes
@@ -57,8 +57,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot
[CVS] OpenPKG: openpkg-registry/ registry-db.pl
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 22-Jun-2006 12:02:26
Branch: HEAD Handle: 2006062211022600
Modified files:
openpkg-registryregistry-db.pl
Log:
change the database constraint to allow new official tags
Summary:
RevisionChanges Path
1.24+17 -1 openpkg-registry/registry-db.pl
patch -p0 '@@ .'
Index: openpkg-registry/registry-db.pl
$ cvs diff -u -r1.23 -r1.24 registry-db.pl
--- openpkg-registry/registry-db.pl 12 May 2006 19:42:31 - 1.23
+++ openpkg-registry/registry-db.pl 22 Jun 2006 10:02:26 - 1.24
@@ -404,6 +404,22 @@
return 1;
}
+# 0.4.0 upgrade to 0.4.1
+#
+elsif ($dbv-{version}-{major} == 0
+ and $dbv-{version}-{minor} == 4
+ and $dbv-{version}-{patch} == 0 ) {
+$sql = ;
+my $constraint = q{ CHECK (registry_orel ~
'^[^-]+-((CURRENT|CURRENT-[0-9]+|[^.-]+-STABLE|[^.-]+-STABLE-[0-9]+|[^.-]+\.[^.-]+-SOLID|[^.-]+\.[^.-]+-SOLID-[0-9]+|[^.-]+\.[^.-]+-RELEASE).*|[0-9]+\.[0-9]+)$')
};
+$sql .= sprintf(ALTER TABLE reg_instance DROP CONSTRAINT
reg_instance_registry_orel_check;\n);
+$sql .= sprintf(ALTER TABLE reg_instance ADD CONSTRAINT
reg_instance_registry_orel_check $constraint;\n);
+$sql .= funcregistry();
+$sql .= sprintf(UPDATE reg_config SET value = '0.4.1';\n);
+$rv = $dbh-do($sql);
+print $sql\nrv=.$rv. message=.$dbh-errstr.\n\n; die if
($dbh-errstr =~ m|ERROR|);
+return 1;
+}
+
# program data version and database version only differ in patchlevel
- just uprev the number
#
elsif ($dbv-{version}-{major} == $datavers-{major}
@@ -578,7 +594,7 @@
-- output from openpkg rpm --eval '%{l_platform -p}'
-- [ix86-freebsd5.4]
registry_orel TEXT
- CHECK (registry_orel ~
'^[^-]+-(CURRENT|[0-9]+\.[0-9]+)$'),
+ CHECK (registry_orel ~
'^[^-]+-((CURRENT|CURRENT-[0-9]+|[^.-]+-STABLE|[^.-]+-STABLE-[0-9]+|[^.-]+\.[^.-]+-SOLID|[^.-]+\.[^.-]+-SOLID-[0-9]+|[^.-]+\.[^.-]+-RELEASE).*|[0-9]+\.[0-9]+)$'),
-- output from openpkg rpm --eval
'%{l_openpkg_release}'
-- [OpenPKG-2.5]
registry_date TIMESTAMP (0) WITHOUT TIME ZONE
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/openpkg-tools/ openpkg-to...
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: 22-Jun-2006 12:41:10 Branch: OPENPKG_2_STABLE Handle: 2006062211411000 Modified files: (Branch: OPENPKG_2_STABLE) openpkg-src/openpkg-tools openpkg-tools.spec Log: MFC: latest version Summary: RevisionChanges Path 1.63.2.3+1 -1 openpkg-src/openpkg-tools/openpkg-tools.spec patch -p0 '@@ .' Index: openpkg-src/openpkg-tools/openpkg-tools.spec $ cvs diff -u -r1.63.2.2 -r1.63.2.3 openpkg-tools.spec --- openpkg-src/openpkg-tools/openpkg-tools.spec 21 Jun 2006 08:03:53 - 1.63.2.2 +++ openpkg-src/openpkg-tools/openpkg-tools.spec 22 Jun 2006 10:41:10 - 1.63.2.3 @@ -32,7 +32,7 @@ Class:BASE Group:Bootstrapping License: MIT -Version: 0.8.56 +Version: 0.8.58 Release: 2.20060622 # package options @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gettext/ gettext.spec
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: 22-Jun-2006 14:10:33
Branch: HEAD Handle: 2006062213103100
Modified files:
openpkg-src/gettext gettext.spec
Log:
upgrading package: gettext 0.14.5 - 0.14.6
Summary:
RevisionChanges Path
1.56+2 -2 openpkg-src/gettext/gettext.spec
patch -p0 '@@ .'
Index: openpkg-src/gettext/gettext.spec
$ cvs diff -u -r1.55 -r1.56 gettext.spec
--- openpkg-src/gettext/gettext.spec 1 Jan 2006 13:13:54 - 1.55
+++ openpkg-src/gettext/gettext.spec 22 Jun 2006 12:10:31 - 1.56
@@ -32,8 +32,8 @@
Class:BASE
Group:Converter
License: GPL
-Version: 0.14.5
-Release: 20050523
+Version: 0.14.6
+Release: 20060622
# list of sources
Source0: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wine/ wine.spec
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: 22-Jun-2006 14:29:27
Branch: HEAD Handle: 2006062213292600
Modified files:
openpkg-src/winewine.spec
Log:
upgrading package: wine 0.9.15 - 0.9.16
Summary:
RevisionChanges Path
1.56+2 -2 openpkg-src/wine/wine.spec
patch -p0 '@@ .'
Index: openpkg-src/wine/wine.spec
$ cvs diff -u -r1.55 -r1.56 wine.spec
--- openpkg-src/wine/wine.spec8 Jun 2006 19:23:07 - 1.55
+++ openpkg-src/wine/wine.spec22 Jun 2006 12:29:26 - 1.56
@@ -32,8 +32,8 @@
Class:EVAL
Group:XWindow
License: LGPL
-Version: 0.9.15
-Release: 20060608
+Version: 0.9.16
+Release: 20060622
# list of sources
Source0:
http://ibiblio.org/pub/linux/system/emulators/wine/wine-%{version}.tar.bz2
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/json/ json.spec
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: 22-Jun-2006 15:29:18
Branch: HEAD Handle: 2006062214291700
Modified files:
openpkg-src/jsonjson.spec
Log:
add missing dependency to perl-openpkg package
Summary:
RevisionChanges Path
1.10+3 -3 openpkg-src/json/json.spec
patch -p0 '@@ .'
Index: openpkg-src/json/json.spec
$ cvs diff -u -r1.9 -r1.10 json.spec
--- openpkg-src/json/json.spec5 Jun 2006 20:06:21 - 1.9
+++ openpkg-src/json/json.spec22 Jun 2006 13:29:17 - 1.10
@@ -39,8 +39,8 @@
Class:EVAL
Group:Language
License: Open Source
-Version: 20060605
-Release: 20060605
+Version: 20060622
+Release: 20060622
# list of sources
Source0: http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz
@@ -52,7 +52,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, perl, make
+BuildPreReq: OpenPKG, openpkg = 20040130, perl, perl-openpkg, make
PreReq: OpenPKG, openpkg = 20040130, perl
AutoReq: no
AutoReqProv: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lcdf-typetools/ lcdf-typetools.spec
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: 22-Jun-2006 15:38:18
Branch: HEAD Handle: 2006062214381800
Added files:
openpkg-src/lcdf-typetools
lcdf-typetools.spec
Log:
new package: lcdf-typetools 2.38 (LCDF Typegraphy Tools)
Summary:
RevisionChanges Path
1.1 +148 -0 openpkg-src/lcdf-typetools/lcdf-typetools.spec
patch -p0 '@@ .'
Index: openpkg-src/lcdf-typetools/lcdf-typetools.spec
$ cvs diff -u -r0 -r1.1 lcdf-typetools.spec
--- /dev/null 2006-06-22 15:38:13 +0200
+++ lcdf-typetools.spec 2006-06-22 15:38:18 +0200
@@ -0,0 +1,148 @@
+##
+## lcdf-typetools.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. http://openpkg.net/
+## Copyright (c) 2000-2006 Ralf S. Engelschall http://engelschall.com/
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package version
+%define V_typetools 2.38
+%define V_t1utils 1.32
+%define V_autofont0.94
+
+# package information
+Name: lcdf-typetools
+Summary: LCDF Typegraphy Tools
+URL: http://www.lcdf.org/type/
+Vendor: Eddie Kohler
+Packager: OpenPKG
+Distribution: OpenPKG
+Class:EVAL
+Group:Text
+License: GPL+MIT-style
+Version: %{V_typetools}
+Release: 20060622
+
+# list of sources
+Source0: http://www.lcdf.org/type/lcdf-typetools-%{V_typetools}.tar.gz
+Source1: http://www.lcdf.org/type/t1utils-%{V_t1utils}.tar.gz
+Source2: http://www.lcdf.org/type/Autofont-%{V_autofont}.tar.gz
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot:%{l_buildroot}
+BuildPreReq: OpenPKG, openpkg = 20040130, perl, perl-openpkg, gcc
+PreReq: OpenPKG, openpkg = 20040130, perl
+AutoReq: no
+AutoReqProv: no
+
+%description
+The LCDF Typetools package contains several command-line programs
+for manipulating PostScript Type 1 and PostScript-flavored
+OpenType fonts. It also contains additional command-line tools for
+dealing with Type 1 fonts from a revision of I. Lee Hetheringtons
+beloved t1utils. Finally, it contains Autofont, a set of tools for
+automating the font generation for TeX.
+
+%track
+prog lcdf-typetools:typetools = {
+version = %{V_typetools}
+url = http://www.lcdf.org/type/
+regex = lcdf-typetools-(__VER__)\.tar\.gz
+}
+prog lcdf-typetools:t1utils = {
+version = %{V_t1utils}
+url = http://www.lcdf.org/type/
+regex = t1utils-(__VER__)\.tar\.gz
+}
+prog lcdf-typetools:autofont = {
+version = %{V_autofont}
+url = http://www.lcdf.org/type/
+regex = Autofont-(__VER__)\.tar\.gz
+}
+
+%prep
+%setup -q -c
+%setup -q -T -D -a1
+%setup -q -T -D -a2
+
+%build
+# build LCDF TypeTools
+( cd lcdf-typetools-%{V_typetools}
+ CC=%{l_cc} \
+ CXX=%{l_cxx} \
+ CFLAGS=%{l_cflags -O} \
+ CXXFLAGS=%{l_cxxflags -O} \
+ CPPFLAGS=%{l_cppflags} \
+ LDFLAGS=%{l_ldflags} \
+ ./configure \
+ --prefix=%{l_prefix}
+ %{l_make} %{l_mflags -O}
+) || exit $?
+
+# build LCDF T1Utils
+( cd t1utils-%{V_t1utils}
+ CC=%{l_cc} \
+ CFLAGS=%{l_cflags -O} \
+ CPPFLAGS
[CVS] OpenPKG: openpkg-src/bash/ bash.spec
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: 22-Jun-2006 16:56:41
Branch: HEAD Handle: 2006062215564000
Modified files:
openpkg-src/bashbash.spec
Log:
ops, wrong raw version
Summary:
RevisionChanges Path
1.79+2 -2 openpkg-src/bash/bash.spec
patch -p0 '@@ .'
Index: openpkg-src/bash/bash.spec
$ cvs diff -u -r1.78 -r1.79 bash.spec
--- openpkg-src/bash/bash.spec12 Apr 2006 18:55:00 - 1.78
+++ openpkg-src/bash/bash.spec22 Jun 2006 14:56:40 - 1.79
@@ -25,7 +25,7 @@
# package version
%define V_base_real 3.1
%define V_base_comp 31
-%define V_plvl_raw 16
+%define V_plvl_raw 17
%define V_plvl_pad 017
# package information
@@ -39,7 +39,7 @@
Group:Shell
License: GPL
Version: %{V_base_real}.%{V_plvl_raw}
-Release: 20060412
+Release: 20060622
# list of sources
Source0: ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: OPENPKG_2_STABLE: openpkg-src/bash/ bash.spec
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: 22-Jun-2006 16:57:52 Branch: OPENPKG_2_STABLE Handle: 2006062215575200 Modified files: (Branch: OPENPKG_2_STABLE) openpkg-src/bashbash.spec Log: MFC: ops, wrong raw version Summary: RevisionChanges Path 1.78.2.2+1 -1 openpkg-src/bash/bash.spec patch -p0 '@@ .' Index: openpkg-src/bash/bash.spec $ cvs diff -u -r1.78.2.1 -r1.78.2.2 bash.spec --- openpkg-src/bash/bash.spec20 Jun 2006 15:14:55 - 1.78.2.1 +++ openpkg-src/bash/bash.spec22 Jun 2006 14:57:52 - 1.78.2.2 @@ -25,7 +25,7 @@ # package version %define V_base_real 3.1 %define V_base_comp 31 -%define V_plvl_raw 16 +%define V_plvl_raw 17 %define V_plvl_pad 017 # package information @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lcdf-typetools/ lcdf-typetools.spec
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: 22-Jun-2006 17:14:06
Branch: HEAD Handle: 2006062216140500
Modified files:
openpkg-src/lcdf-typetools
lcdf-typetools.spec
Log:
add FonTools
Summary:
RevisionChanges Path
1.2 +27 -6 openpkg-src/lcdf-typetools/lcdf-typetools.spec
patch -p0 '@@ .'
Index: openpkg-src/lcdf-typetools/lcdf-typetools.spec
$ cvs diff -u -r1.1 -r1.2 lcdf-typetools.spec
--- openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 13:38:18
- 1.1
+++ openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 15:14:05
- 1.2
@@ -26,6 +26,7 @@
%define V_typetools 2.38
%define V_t1utils 1.32
%define V_autofont0.94
+%define V_fontools20051003
# package information
Name: lcdf-typetools
@@ -44,22 +45,23 @@
Source0: http://www.lcdf.org/type/lcdf-typetools-%{V_typetools}.tar.gz
Source1: http://www.lcdf.org/type/t1utils-%{V_t1utils}.tar.gz
Source2: http://www.lcdf.org/type/Autofont-%{V_autofont}.tar.gz
+Source3:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/fontools/fontools-%{V_fontools}.zip
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, perl, perl-openpkg, gcc
+BuildPreReq: OpenPKG, openpkg = 20040130, perl, perl-openpkg, gcc, infozip
PreReq: OpenPKG, openpkg = 20040130, perl
AutoReq: no
AutoReqProv: no
%description
The LCDF Typetools package contains several command-line programs
-for manipulating PostScript Type 1 and PostScript-flavored
-OpenType fonts. It also contains additional command-line tools for
-dealing with Type 1 fonts from a revision of I. Lee Hetheringtons
-beloved t1utils. Finally, it contains Autofont, a set of tools for
-automating the font generation for TeX.
+for manipulating PostScript Type 1 and PostScript-flavored OpenType
+fonts. It also contains additional command-line tools for dealing
+with Type 1 fonts from a revision of I. Lee Hetheringtons beloved
+t1utils. Finally, it contains Autofont and FonTools, a set of tools
+for automating the font generation for TeX.
%track
prog lcdf-typetools:typetools = {
@@ -77,11 +79,17 @@
url = http://www.lcdf.org/type/
regex = Autofont-(__VER__)\.tar\.gz
}
+prog lcdf-typetools:fontools = {
+version = %{V_fontools}
+url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/fontools/
+regex = fontools-(__VER__)\.zip
+}
%prep
%setup -q -c
%setup -q -T -D -a1
%setup -q -T -D -a2
+%{l_prefix}/bin/unzip -x %{SOURCE3}
%build
# build LCDF TypeTools
@@ -133,6 +141,19 @@
%{l_prefix}/bin/perl-openpkg install
) || exit $?
+# install FonTools
+( cd fontools
+ %{l_shtool} install -c -m 755 \
+ -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
+ bin/* $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 644 \
+ doc/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/lcdf-typetools/fontools
+ %{l_shtool} install -c -m 644 \
+ share/* $RPM_BUILD_ROOT%{l_prefix}/share/lcdf-typetools/fontools/
+) || exit $?
+
# post-adjust installation area
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* /dev/null 21 || true
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lcdf-typetools/ lcdf-typetools.spec
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: 22-Jun-2006 17:50:57
Branch: HEAD Handle: 2006062216505600
Modified files:
openpkg-src/lcdf-typetools
lcdf-typetools.spec
Log:
shut up unzip messages; make saure kpathsea library is found
Summary:
RevisionChanges Path
1.3 +3 -2 openpkg-src/lcdf-typetools/lcdf-typetools.spec
patch -p0 '@@ .'
Index: openpkg-src/lcdf-typetools/lcdf-typetools.spec
$ cvs diff -u -r1.2 -r1.3 lcdf-typetools.spec
--- openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 15:14:05
- 1.2
+++ openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 15:50:56
- 1.3
@@ -89,7 +89,7 @@
%setup -q -c
%setup -q -T -D -a1
%setup -q -T -D -a2
-%{l_prefix}/bin/unzip -x %{SOURCE3}
+%{l_prefix}/bin/unzip -q -x %{SOURCE3}
%build
# build LCDF TypeTools
@@ -101,7 +101,8 @@
CPPFLAGS=%{l_cppflags} \
LDFLAGS=%{l_ldflags} \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --with-kpathsea=%{l_prefix}
%{l_make} %{l_mflags -O}
) || exit $?
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lcdf-typetools/ lcdf-typetools.spec
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: 22-Jun-2006 18:22:57
Branch: HEAD Handle: 2006062217225700
Modified files:
openpkg-src/lcdf-typetools
lcdf-typetools.spec
Log:
requires teTeX for kpathsea library technically and teTeX indirectly
because of scope of activity anyway, too
Summary:
RevisionChanges Path
1.4 +2 -2 openpkg-src/lcdf-typetools/lcdf-typetools.spec
patch -p0 '@@ .'
Index: openpkg-src/lcdf-typetools/lcdf-typetools.spec
$ cvs diff -u -r1.3 -r1.4 lcdf-typetools.spec
--- openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 15:50:56
- 1.3
+++ openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 16:22:57
- 1.4
@@ -50,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
-BuildPreReq: OpenPKG, openpkg = 20040130, perl, perl-openpkg, gcc, infozip
-PreReq: OpenPKG, openpkg = 20040130, perl
+BuildPreReq: OpenPKG, openpkg = 20040130, tetex, perl, perl-openpkg, gcc,
infozip
+PreReq: OpenPKG, openpkg = 20040130, tetex, perl
AutoReq: no
AutoReqProv: no
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lcdf-typetools/ lcdf-typetools.spec
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: 22-Jun-2006 21:11:42
Branch: HEAD Handle: 2006062220114100
Modified files:
openpkg-src/lcdf-typetools
lcdf-typetools.spec
Log:
install the encoding files into TEXMF so TeX is able to pick them up
with kpathsea automatically
Summary:
RevisionChanges Path
1.5 +2 -2 openpkg-src/lcdf-typetools/lcdf-typetools.spec
patch -p0 '@@ .'
Index: openpkg-src/lcdf-typetools/lcdf-typetools.spec
$ cvs diff -u -r1.4 -r1.5 lcdf-typetools.spec
--- openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 16:22:57
- 1.4
+++ openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 19:11:41
- 1.5
@@ -150,9 +150,9 @@
%{l_shtool} install -c -m 644 \
doc/*.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/share/lcdf-typetools/fontools
+
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/fonts/enc/dvips/lcdf-typetools/fontools
%{l_shtool} install -c -m 644 \
- share/* $RPM_BUILD_ROOT%{l_prefix}/share/lcdf-typetools/fontools/
+ share/*
$RPM_BUILD_ROOT%{l_prefix}/share/texmf/fonts/enc/dvips/lcdf-typetools/fontools/
) || exit $?
# post-adjust installation area
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-re/ releasenotes.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 22-Jun-2006 21:19:09
Branch: HEAD Handle: 2006062220190800
Modified files:
openpkg-re releasenotes.txt
Log:
mention Build Tool, Release detection with TAG and URL configuration
and changes related to %{l_openpkg_release} rpmmacro
Summary:
RevisionChanges Path
1.21+48 -1 openpkg-re/releasenotes.txt
patch -p0 '@@ .'
Index: openpkg-re/releasenotes.txt
$ cvs diff -u -r1.20 -r1.21 releasenotes.txt
--- openpkg-re/releasenotes.txt 21 Jun 2006 19:26:06 - 1.20
+++ openpkg-re/releasenotes.txt 22 Jun 2006 19:19:08 - 1.21
@@ -2,7 +2,7 @@
OpenPKG Release Notes
=
- o $Revision: 1.20 $. The most recent update of this file can be
+ o $Revision: 1.21 $. The most recent update of this file can be
downloaded from http://cvs.openpkg.org/openpkg-re/releasenotes.txt
The history of this document, specific versions and
differences between versions can be retrieved from
@@ -66,11 +66,58 @@
package because the whole functionality is embedded in the bootstrap
anyway.
+ New in CURRENT past OpenPKG-2-STABLE-20060622
+ =
+
+ o %{l_openpkg_release} rpmmacro
+
+CURRENT packages already have been modified to no longer use the outdated
+-F %s construct and compatibility has been dropped from the CURRENT
+bootstrap.
+
New in OpenPKG-2-STABLE-20060622
o Vendor packages updated
+ o Build Tool
+
+The openpkg install openpkg-tools helper tool has been replaced by a
+openpkg build openpkg-tools simulator that comes with the bootstrap and
+is able to download, build and install the openpkg-tools package which
+in turn overrides the simulator with the full blown openpkg build tool.
+The simulator works compatible to the full blown openpkg build in the
+areas of detection of and downloading of available packages and it
creates
+an identical shell script output suitable for piping into sh(1).
+
+ o Release detection
+
+The bootstrap internal logic, including the %{l_openpkg_release}
+rpmmmacro, the openpkg build simulator and the full blown openpkg
+build tool use a new and common code base to detect whether the instance
+they belong to runs OpenPKG-CURRENT, -STABLE or -SOLID/-RELEASE. A new
and
+powerful openpkg release command was added to provide a suitable human
+and programmatic interface to the detection logic. The logic operates on
+package names and by design [1] cannot detect snapshots, thus updates
will
+be searched in the appropriate branch unless manual configuration is
done.
+
+[1] see Package Name column in
http://www.openpkg.org/development/cvs.txt
+
+
+ o %{l_openpkg_release} rpmmacro
+
+The rpmmacro in the STABLE branch is backwards compatible to previous
+versions and supports the outdated -F %s query construct which is used
+by some STABLE packages.
+
+ o Release TAG and URL configuration
+
+To replace release detection logic by manual configuration, create a
+%{l_prefix}/etc/openpkg/release file and place a TAG setting inside, e.g.
+TAG=2-STABLE-20060622. It is also possible to point openpkg build to
+an alternate package download location, usually a local mirror of -
+probably modified - packages. See openpkg man release.
+
Upgrade from OpenPKG-2.5-RELEASE to OpenPKG-2-STABLE-20060622
=
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/lcdf-typetools/ lcdf-typetools.spec
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: 22-Jun-2006 21:25:23 Branch: HEAD Handle: 2006062220252300 Modified files: openpkg-src/lcdf-typetools lcdf-typetools.spec Log: automatically update the TeX hash files to make sure the installed .enc files are immediately available Summary: RevisionChanges Path 1.6 +10 -0 openpkg-src/lcdf-typetools/lcdf-typetools.spec patch -p0 '@@ .' Index: openpkg-src/lcdf-typetools/lcdf-typetools.spec $ cvs diff -u -r1.5 -r1.6 lcdf-typetools.spec --- openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 19:11:41 - 1.5 +++ openpkg-src/lcdf-typetools/lcdf-typetools.spec22 Jun 2006 19:25:23 - 1.6 @@ -168,3 +168,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +# update TeX hashes +$RPM_INSTALL_PREFIX/bin/texhash /dev/null 21 || true +exit 0 + +%postun +# update TeX hashes +$RPM_INSTALL_PREFIX/bin/texhash /dev/null 21 || true +exit 0 + @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
