fullnames

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..3ccaa9a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+oss-pkg-GoogleChrome.spec

diff --git a/FULLNAMES b/FULLNAMES
new file mode 100644 (file)
index 0000000..214f39b
--- /dev/null
+++ b/FULLNAMES
@@ -0,0 +1 @@
+Google Chrome

diff --git a/Makefile b/Makefile
index 50c588a500f799e5cd29f25a870b9e8b40244dbe..a8d4315706d2077c477f3eee9c3d86daf51bca21 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ package:
        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
+       ../oss-pkg-tools/create_hash.sh $(PACKAGE)
        mkdir -p oss-pkg-$(PACKAGE)
        if [ ! -e $(PACKAGE).sls ];  then cp ../template/template.sls $(PACKAGE).sls; fi
        sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls

diff --git a/oss-pkg-GoogleChrome.spec b/oss-pkg-GoogleChrome.spec.in
similarity index 52%
rename from oss-pkg-GoogleChrome.spec
rename to oss-pkg-GoogleChrome.spec.in
index 4dc787cb10b7e8342262dcbc0f9c88caec8839aa..f844098ce78493d821a22cc9b0eaab2046dd45b1 100644 (file)
--- a/oss-pkg-GoogleChrome.spec
+++ b/oss-pkg-GoogleChrome.spec.in
@@ -1,12 +1,12 @@
 #
-# Spec file for GoogleChrome
+# Spec file for PACKAGE
 # Copyright (c) 2018 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
 #
 
-Name:         oss-pkg-GoogleChrome
-Summary:      Package to install GoogleChrome on OSS-Clients
-Version:      69.0.3497.100
-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 GoogleChrome 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/GoogleChrome
+mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE
 mkdir -p %{buildroot}/srv/salt/packages/
-cp GoogleChrome.sls  %{buildroot}/srv/salt/packages/
-cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/GoogleChrome
+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":"GoogleChrome","manually":false,"description":"GoogleChrome","softwareVersions":[{"version":"69.0.3497.100"}]}'
+/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json
 
 %files
 %defattr(644,root,root)
-/srv/salt/win/repo-ng/GoogleChrome
-/srv/salt/packages/GoogleChrome.sls
+/srv/salt/win/repo-ng/PACKAGE
+/srv/salt/packages/PACKAGE.sls