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: 30-Jan-2007 09:28:20
Branch: HEAD Handle: 2007013008281900
Modified files:
openpkg-src/bazaar bazaar.spec
Log:
add bzrtools plugins
Summary:
Revision Changes Path
1.2 +32 -13 openpkg-src/bazaar/bazaar.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bazaar/bazaar.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 bazaar.spec
--- openpkg-src/bazaar/bazaar.spec 27 Jan 2007 11:03:43 -0000 1.1
+++ openpkg-src/bazaar/bazaar.spec 30 Jan 2007 08:28:19 -0000 1.2
@@ -22,6 +22,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_bzr 0.14
+%define V_bzrtools 0.14.0
+
# package information
Name: bazaar
Summary: Version Control System
@@ -32,11 +36,12 @@
Class: EVAL
Group: SCM
License: GPL
-Version: 0.14
-Release: 20070127
+Version: %{V_bzr}
+Release: 20070130
# list of sources
-Source0: http://bazaar-vcs.org/releases/src/bzr-%{version}.tar.gz
+Source0: http://bazaar-vcs.org/releases/src/bzr-%{V_bzr}.tar.gz
+Source1:
http://panoramicfeedback.com/opensource/bzrtools-%{V_bzrtools}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -64,14 +69,20 @@
permission.
%track
- prog bazaar = {
- version = %{version}
+ prog bazaar:bzr = {
+ version = %{V_bzr}
url = http://bazaar-vcs.org/releases/src/
regex = bzr-(__VER__)\.tar\.gz
}
+ prog bazaar:bzrtools = {
+ version = %{V_bzrtools}
+ url = http://bazaar-vcs.org/BzrTools
+ regex = bzrtools-(__VER__)\.tar\.gz
+ }
%prep
- %setup -q -n bzr-%{version}
+ %setup -q -c
+ %setup -q -D -T -a 1
%build
@@ -81,13 +92,21 @@
$RPM_BUILD_ROOT%{l_prefix}/bin \
$RPM_BUILD_ROOT%{l_prefix}/libexec/bazaar \
$RPM_BUILD_ROOT%{l_prefix}/lib/bazaar
- %{l_shtool} subst \
- -e 's;#! /usr/bin/env python;#!%{l_prefix}/bin/python;g' \
- bzr
- %{l_prefix}/bin/python setup.py install \
- --root=$RPM_BUILD_ROOT \
- --prefix=%{l_prefix} \
- --install-lib=%{l_prefix}/lib/bazaar
+ ( cd bzr-%{V_bzr}
+ %{l_shtool} subst \
+ -e 's;#! /usr/bin/env python;#!%{l_prefix}/bin/python;g' \
+ bzr
+ %{l_prefix}/bin/python setup.py install \
+ --root=$RPM_BUILD_ROOT \
+ --prefix=%{l_prefix} \
+ --install-lib=%{l_prefix}/lib/bazaar
+ ) || exit $?
+ ( cd bzrtools
+ %{l_prefix}/bin/python setup.py install \
+ --root=$RPM_BUILD_ROOT \
+ --prefix=%{l_prefix} \
+ --install-lib=%{l_prefix}/lib/bazaar
+ ) || exit $?
mv $RPM_BUILD_ROOT%{l_prefix}/bin/bzr \
$RPM_BUILD_ROOT%{l_prefix}/libexec/bazaar/bzr
( echo "#!/bin/sh"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
