bin/pack-debug | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
New commits:
commit 22b9afc57831f2fbd6ddad8c4a166f9a02154888
Author: László Németh <laszlo.nem...@collabora.com>
Date: Fri Dec 16 19:11:34 2016 +0100
pack-debug: clean up
Change-Id: I046bd0546d2b9838e940c0cc3444a42a239175b7
diff --git a/bin/pack-debug b/bin/pack-debug
index f5a31ac..6270229 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -12,22 +12,15 @@
# build path
export BUILD_PATH=$PWD
-# set package base name, eg. collaboraoffice5.1
-# based on the actual directory, eg. /opt/collaboraoffice5.1,
-# or checking the PACKAGENAME environmental variable
-
-if [ -z "$PACKAGENAME" ]
-then
-DEBUGSRC_PACKAGENAME=$(basename $BUILD_PATH)
-else
-DEBUGSRC_PACKAGENAME=$PACKAGENAME
-fi
-echo PACKAGE NAME: $DEBUGSRC_PACKAGENAME
-
# set install dirname and product version
eval $(grep ^INSTALLDIRNAME config.log)
eval $(grep ^PRODUCTVERSION config.log)
+# set package base name, eg. collaboraoffice5.1
+DEBUGSRC_PACKAGENAME=$INSTALLDIRNAME$PRODUCTVERSION
+
+echo PACKAGENAME: $DEBUGSRC_PACKAGENAME
+
#################################
# Function for re-build RPM files
#################################
@@ -50,13 +43,6 @@ DEBUGSRC="$(find workdir -name
${DEBUGSRC_PACKAGENAME}.spec.log)"
echo Base spec file: $DEBUGSRC
-if [ -z "$DEBUGSRC" ]
-then
- echo "Missing ${DEBUGSRC_PACKAGENAME}.spec.log in workdir/, specify spec.log
file name in PACKAGENAME"
- echo "For example: PACKAGENAME=collaboraoffice5.1 dbg_pkg"
- exit 1
-fi
-
# create spec file, based on the spec file of the brand package
cat $DEBUGSRC | awk '
@@ -76,7 +62,7 @@ cat $DEBUGSRC | awk '
# create source file list
- find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev
'/(workdir|qa|DEBS)/' | grep -E '/(source|inc)/' |
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev
'/(instdir|workdir|qa|DEBS)/' |
# list all directories for complete rpm remove
@@ -204,7 +190,7 @@ cat $DEBUGSRC | awk '
# create source file list
- find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev
'/(workdir|qa|DEBS)/' | grep -E '/(source|inc)/' |
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev
'/(instdir|workdir|qa|DEBS)/' |
# list all directories
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
