Fixing resulting package name

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8682300720e8dfe2a0df9cff68ae4c706bde685..28c19e0d398fc04678ccf67112e1ed214e1fd95c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,10 +200,10 @@ Linter:
       PKG_VERSION=$( ./get-rpm-version )
       PKG_RELEASE=$( ./get-rpm-release )
       echo "Version to build: ${PKG_VERSION}-${PKG_RELEASE}"
-      mkdir -pv "rpmdir/SOURCES/pp_admintools-${PKG_VERSION}"
-      tar cf - ${ROOT_OBJECTS} | (cd "rpmdir/SOURCES/pp_admintools-${PKG_VERSION}" ; tar xf -)
-      echo "Creating rpmdir/SOURCES/pp_admintools.${PKG_VERSION}.tar.gz ..."
-      cd rpmdir/SOURCES && tar cfz "pp_admintools.${PKG_VERSION}.tar.gz" "pp_admintools-${PKG_VERSION}"
+      mkdir -pv "rpmdir/SOURCES/pp-admintools-${PKG_VERSION}"
+      tar cf - ${ROOT_OBJECTS} | (cd "rpmdir/SOURCES/pp-admintools-${PKG_VERSION}" ; tar xf -)
+      echo "Creating rpmdir/SOURCES/pp-admintools.${PKG_VERSION}.tar.gz ..."
+      cd rpmdir/SOURCES && tar cfz "pp-admintools.${PKG_VERSION}.tar.gz" "pp-admintools-${PKG_VERSION}"
       ls -lA --color=always
       cd "${ODIR}"
     - |

diff --git a/pp-admintools.spec.template b/pp-admintools.spec.template
index cc7c3c45e8c28b0e0ad595159bce30a7f9bcde93..34d3afff618922d1ca1d4fb4988caf2beb712902 100644 (file)
--- a/pp-admintools.spec.template
+++ b/pp-admintools.spec.template
@@ -1,9 +1,9 @@
 # vim: filetype=spec
 
 %define version @@@Version@@@
-%define builddir python@@@py_version_nodot@@@_pp-admintools-%{version}
+%define builddir pp-admintools-%{version}
 
-Name:           python@@@py_version_nodot@@@-pp-admintools
+Name:           pp-admintools
 Version:        %{version}
 Release:        @@@Release@@@%{?dist}
 Summary:        Scripts and modules for admin tasks of DPX Betriebs-Department
@@ -12,7 +12,7 @@ Group:          Development/Languages/Python
 License:        LGPL-3
 Distribution:   Frank Brehm
 URL:            https://git.pixelpark.com/ppadmin/admin-tools
-Source0:        pp_admintools.%{version}.tar.gz
+Source0:        pp-admintools.%{version}.tar.gz
 
 BuildRequires:  gettext
 BuildRequires:  python@@@py_version_nodot@@@
@@ -39,7 +39,7 @@ BuildArch:      noarch
 %description
 Scripts and modules for admin tasks of DPX Betriebs-Department
 
-This is the Python@@@py_version_nodot@@@ version.
+This package is intended to use with Python@@@py_version_nodot@@@.
 
 In this package are contained the following scripts:
  * dns-deploy-zones