Changeset 429 in ProjectBuilder for projects/mondorescue/pbconf

Timestamp:

May 8, 2008, 2:04:20 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Change filtering interface to add pbrepo keyword support and PBREPO macro
• Add repository generation support + conf files to pb for rpm
• Adapt pb and mondorecue spec files to new interfaces

Location:

projects/mondorescue/pbconf/branches/2.2.6

Files:

• mindi-busybox/rpm/mindi-busybox.spec (modified) (1 diff)
• mindi/rpm/mindi.spec (modified) (1 diff)
• mondo-doc/rpm/mondo-doc.spec (modified) (1 diff)
• mondo/rpm/mondo.spec (modified) (1 diff)
• mondorescue.pb (modified) (1 diff)
• pbfilter/all.pbf (modified) (1 diff)

projects/mondorescue/pbconf/branches/2.2.6/mindi-busybox/rpm/mindi-busybox.spec

@@ -9 +9 @@
 Group:      PBGRP
 Url:        http://www.mondorescue.org
-Source:     PBSRC
+Source:     PBREPO/PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 PBREQ

projects/mondorescue/pbconf/branches/2.2.6/mindi/rpm/mindi.spec

@@ -9 +9 @@
 Group:      PBGRP
 Url:        http://www.mondorescue.org
-Source:     PBSRC
+Source:     PBREPO/PBSRC
 # Not yet possible as busybox is a binary that should go alongside
 # BuildArch:    noarch

projects/mondorescue/pbconf/branches/2.2.6/mondo-doc/rpm/mondo-doc.spec

@@ -12 +12 @@
 Group:      PBGRP
 Url:        http://www.mondorescue.org
-Source:     PBSRC
+Source:     PBREPO/PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:  docbook-utils

projects/mondorescue/pbconf/branches/2.2.6/mondo/rpm/mondo.spec

@@ -14 +14 @@
 Group:      PBGRP
 Url:        http://www.mondorescue.org
-Source:     PBSRC
+Source:     PBREPO/PBSRC
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:  newt-devel >= 0.50

projects/mondorescue/pbconf/branches/2.2.6/mondorescue.pb

@@ -11 +11 @@
 # Packager label
 pbpackager mondorescue = Bruno Cornec <bruno@mondorescue.org>
+
+# Root repo
+pbrepo mondorescue = ftp://ftp.mondorescue.org
 
 #

projects/mondorescue/pbconf/branches/2.2.6/pbfilter/all.pbf

@@ -4 +4 @@
 # Filter for rpm build
 #
+# PBURL is replaced by the root URL to access the repository
+filter PBREPO = $pbrepo
+
 # PBSRC is replaced by the source package format
-filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz
+filter PBSRC = src/%{name}-%{version}.tar.gz
 
 # PBVER is replaced by the version ($pbver in code)