Fix package structure.

diff --git a/Makefile b/Makefile
index 68bafd5019707496199112ef4b885c01815dda70..ec4b3ecbaff0b50024d49760ec18a3b90112e5a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,7 @@ YEAR            = $(shell date +%Y )
 
 
 package:
-       if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi
-       sed -i s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec
+       sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in oss-pkg-$(PACKAGE).spec 
        sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec
        sed -i s/PACKAGE/$(PACKAGE)/g  oss-pkg-$(PACKAGE).spec
        sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec

diff --git a/oss-pkg-7zip.spec b/oss-pkg-7zip.spec.in
similarity index 50%
rename from oss-pkg-7zip.spec
rename to oss-pkg-7zip.spec.in
index 9aec7d3d26ebf9fe7c27ce180b1e63869d754316..079b12d8ea16b4a57df1da3b1ad4fcf2999e9070 100644 (file)
--- a/oss-pkg-7zip.spec
+++ b/oss-pkg-7zip.spec.in
@@ -1,12 +1,12 @@
 #
-# Spec file for 7zip
-# Copyright (c) 2018 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
+# Spec file for PACKAGE
+# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
-Name:         oss-pkg-7zip
-Summary:      Package to install 7zip on OSS-Clients
-Version:      16.04.00.0
-Release:      2
+Name:         oss-pkg-PACKAGE
+Summary:      Package to install PACKAGE on OSS-Clients
+Version:      VERSION
+Release:      RELEASE
 License:      GPL-2.0
 Vendor:       Peter Varkoly and Helmuth Varkoly
 Packager:     peter@varkoly.de
@@ -21,7 +21,7 @@ PreReq:       %fillup_prereq
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
-Package to install 7zip on OSS-Clients
+Package to install PACKAGE on OSS-Clients
 
 Authors:
 --------
@@ -36,10 +36,10 @@ Authors:
 
 %install
 
-mkdir -p %{buildroot}/srv/salt/win/repo-ng/7zip
+mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE
 mkdir -p %{buildroot}/srv/salt/packages/
-cp 7zip.sls  %{buildroot}/srv/salt/packages/
-cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/7zip
+cp PACKAGE.sls  %{buildroot}/srv/salt/packages/
+cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE
 
 %clean
 rm -rf %{buildroot}
@@ -48,11 +48,11 @@ rm -rf %{buildroot}
 
 %post
 
-/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"7zip","manually":false,"description":"7zip","softwareVersions":[{"version":"16.04.00.0"}]}'
+/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}'
 
 %files
 %defattr(644,root,root)
-/srv/salt/win/repo-ng/7zip
-/srv/salt/packages/7zip.sls
+/srv/salt/win/repo-ng/PACKAGE
+/srv/salt/packages/PACKAGE.sls
 
 

diff --git a/repo-ng/7zip/7z1604-x64.msi b/repo-ng/7zip/7z1604-x64.msi
deleted file mode 100755 (executable)
index 6689d89..0000000
Binary files a/repo-ng/7zip/7z1604-x64.msi and /dev/null differ

diff --git a/repo-ng/7zip/7z1604.msi b/repo-ng/7zip/7z1604.msi
deleted file mode 100755 (executable)
index fcbabed..0000000
Binary files a/repo-ng/7zip/7z1604.msi and /dev/null differ

diff --git a/repo-ng/7zip/init.sls b/repo-ng/7zip/init.sls
deleted file mode 100755 (executable)
index 3228e58..0000000
--- a/repo-ng/7zip/init.sls
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# SLS: 7zip
-# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
-# All rights reserved.
-#
-# Authors:              Helmuth Varkoly
-#
-# Description:          Package SLS
-###############################################################################
-
-{% if grains['cpuarch'] == 'AMD64' %}
-{% set ARCH = "x64" %}
-{% else %}
-{% set ARCH = "x86" %}
-{% endif %}
-
-{% set LOG_PATH = 'C:\\salt\\var\\log' %}
-
-7zip:
-  '16.04.00.0':
-    {% if ARCH == 'x64' %}
-    installer: salt://win/repo-ng/7zip/7z1604-x64.msi
-    uninstaller: salt://win/repo-ng/7zip/7z1604-x64.msi
-    full_name: '7-Zip 16.04 (x64 edition)'
-    {% else %}
-    full_name: '7-Zip 16.04'
-    installer: salt://win/repo-ng/7zip/7z1604.msi
-    uninstaller: salt://win/repo-ng/7zip/7z1604.msi
-    {% endif %}
-    install_flags: '/quiet /log "{{ LOG_PATH }}\7zip_inst.log"'
-    uninstall_flags: '/quiet /log "{{ LOG_PATH }}\7zip_uninst.log"'
-    msiexec: True
-    locale: de_DE
-    reboot: False
-    cache_dir: False