Changeset 313 in MondoRescue

Timestamp:

Jan 13, 2006, 7:31:32 PM (18 years ago)

Author:

bcornec

Message:

spec file generation adapted (RRR used for revision, suffix now has the '.', Group is now a variable)

Location:

branches/2.06

Files:

• mindi/mindi.spec (modified) (4 diffs)
• mondo/mondo.spec (modified) (4 diffs)
• tools/mkrpm (modified) (3 diffs)
• tools/rpm-env (modified) (3 diffs)

branches/2.06/mindi/mindi.spec

@@ -10 +10 @@
 %define name    mindi
 %define version VVV
-%define mrel    1
+%define mrel    RRR
 %define src     %{name}-%{version}.tgz
+%define grp     Archiving/Backup
 
 %if %is_redhat
-Group:          Applications/Archiving
+%define grp     Applications/Archiving
 Autoreq:    0
 %endif
@@ -20 +21 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
 Autoreqprov: no
 %endif
@@ -26 +26 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
 Autoreqprov: no
 %endif
 
 %if %is_suse
-Group:          Archiving/Backup
 %endif
 
@@ -39 +37 @@
 Release:    %mrel
 License:    GPL
-Group:      System/Kernel and hardware
+Group:      %{grp}
 Url:        http://mondorescue.berlios.de
 Source:     %{src}

branches/2.06/mondo/mondo.spec

@@ -10 +10 @@
 %define name    mondo
 %define version VVV
-%define mrel    1
+%define mrel    RRR
 %define src     %{name}-%{version}.tgz
+%define grp     Archiving/Backup
 
 %if %is_redhat
-Group:          Applications/Archiving
+%define src     Applications/Archiving
 Autoreq:        0
 %endif
@@ -20 +21 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
 Autoreqprov:    no
 %endif
@@ -26 +26 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
 Autoreqprov:    no
 %endif
 
 %if %is_suse
-Group:          Archiving/Backup
 %endif
 
@@ -43 +41 @@
 Release:    %{mrel}
 License:    GPL
+Group:      %{grp}
 Url:        http://mondorescue.berlios.de
 Source:     %{src}

branches/2.06/tools/mkrpm

@@ -38 +38 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
-    sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
+    sed "s/^%define mrel..*RRR/%define mrel ${rev}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     rm -f ${TMP}/mindi-kernel*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
@@ -55 +55 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
-    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -f ${TMP}/mindi-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
     # ATTENTION: This could be dangerous for your setup
     opt="rm -rf /usr/lib/mindi ;"
@@ -76 +76 @@
     tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
-    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -f ${TMP}/mondo-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 cd ${TOPDIR}/SPECS

branches/2.06/tools/rpm-env

@@ -37 +37 @@
     export ddir="mandriva"
     export dver=`awk '{print $4}' /etc/mandriva-release`
-    export suf="${dver}mdk"
+    export suf=".${dver}mdk"
 elif [ -e /etc/mandrake-release ]; then
     export ddir="mandrake"
     export dver=`awk '{print $3}' /etc/mandrake-release`
-    export suf="${dver}mdk"
+    export suf=".${dver}mdk"
 elif [ -e /etc/redhat-release ]; then
     grep -q Enterprise /etc/redhat-release
@@ -50 +50 @@
         export ddir="fedora"
         export dver=`awk '{print $4}' /etc/redhat-release`
-        export suf="fc${dver}"
+        export suf=".fc${dver}"
     else
         export ddir="redhat"
         export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
-        export suf="rh${dver}"
+        export suf=".rh${dver}"
     fi
 elif [ -e /etc/SuSE-release ]; then
@@ -71 +71 @@
 
 if [ _"$suf" = _"" ]; then
-    export suf="${ddir}${dver}"
+    export suf=".${ddir}${dver}"
 fi