Browse Source

add bzrtools plugins

Ralf S. Engelschall 19 years ago
parent
commit
7e1de105f5
1 changed files with 32 additions and 13 deletions
  1. 32 13
      bazaar/bazaar.spec

+ 32 - 13
bazaar/bazaar.spec

@@ -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 @@ Distribution: OpenPKG Community
 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 @@ AutoReqProv:  no
     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 @@ AutoReqProv:  no
         $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"