Changeset 2115 in ProjectBuilder

Timestamp:

Jul 22, 2016, 11:44:45 AM (8 years ago)

Author:

Bruno Cornec

Message:

Adapt MondoRescue to pb 0.14.x usage with new naming

Location:

projects/mondorescue/pbconf/branches/3.2

Files:

• MondoRescue/pbfilter/all.pbf (modified) (1 diff)
• MondoRescue/rpm/perl-MondoRescue.spec (modified) (1 diff)
• mindi-busybox/rpm/mindi-busybox.spec (modified) (2 diffs)
• mindi/rpm/mindi.spec (modified) (2 diffs)
• mondo-doc/rpm/mondo-doc.spec (modified) (2 diffs)
• mondo/rpm/mondo.spec (modified) (2 diffs)
• pbfilter/all.pbf (modified) (1 diff)

projects/mondorescue/pbconf/branches/3.2/MondoRescue/pbfilter/all.pbf

@@ -1 +1 @@
 filter PBDESC = The PBREALPKG provides a set of functions for the MondoRescue project
 filter PBSUMMARY = The PBREALPKG provides a set of functions for the MondoRescue project
-
-# Overwrite default to handle perl module name
-filter PBSRC = src/%{srcname}-%{version}.tar.gz

projects/mondorescue/pbconf/branches/3.2/MondoRescue/rpm/perl-MondoRescue.spec

@@ -27 +27 @@
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n %{srcname}-%{version}PBEXTDIR
 
 %build

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

@@ -2 +2 @@
 # $Id$
 #
+%define srcname PBPKG
+
 Summary:    PBSUMMARY
 Name:       PBPKG
@@ -21 +23 @@
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}PBEXTDIR
 
 %build

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

@@ -1 +1 @@
 #
-# $Id: mindi.spec 1866 2008-01-16 15:29:04Z bruno $
+# $Id$
 #
 # Avoids to generate debug packages
 %global debug_package %{nil}
+%define srcname PBPKG
 
 Summary:    PBSUMMARY
@@ -39 +40 @@
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}PBEXTDIR
 
 %build

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

@@ -1 +1 @@
 #
-# $Id: mondo-doc.spec 1674 2007-10-01 23:22:00Z bruno $
+# $Id$
 #
+%define srcname PBPKG
 
 Summary:    Documentation for Mondo Rescue
@@ -24 +25 @@
 
 %prep
-%setup -q -n %name-%{version}
+%setup -q -n %{name}-%{version}PBEXTDIR
 
 %build

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

@@ -1 +1 @@
 #
-# $Id: mondo.spec 1892 2008-03-22 00:57:27Z bruno $
+# $Id$
 #
+%define srcname PBPKG
 
 Summary:    PBSUMMARY
@@ -65 +66 @@
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}PBEXTDIR
 
 %build

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

@@ -8 +8 @@
 
 # PBSRC is replaced by the source package format
-filter PBSRC = src/%{name}-%{version}.tar.gz
+filter PBSRC = src/%{srcname}-%{version}$pb->{'extdir'}.tar.gz
 
 # PBVER is replaced by the version ($pb->{'ver'} in code)
-filter PBVER = $pb->{'ver'}$pb->{'extdir'}
+filter PBVER = $pb->{'ver'}
 
 # PBDATE is replaced by the date ($pb->{'date'} in code)