FULLNAMES

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

diff --git a/FULLNAMES b/FULLNAMES
new file mode 100644 (file)
index 0000000..ae7dfde
--- /dev/null
+++ b/FULLNAMES
@@ -0,0 +1 @@
+Adobe Acrobat Reader DC - Deutsch

diff --git a/Makefile b/Makefile
index 50c588a500f799e5cd29f25a870b9e8b40244dbe..3e6942e5abe64d8a42908152676b0f2b8bf02c95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ YEAR          = $(shell date +%Y )
 
 
 package:
-       if [ ! -e oss-pkg-$(PACKAGE).spec ]; then cp ../template/package.spec oss-pkg-$(PACKAGE).spec; fi
+       sed    s/VERSION/$(VERSION)/g  oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec
        sed -i s/VERSION/$(VERSION)/g  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
+       ../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-AcroReaderDC.spec b/oss-pkg-AcroReaderDC.spec
deleted file mode 100644 (file)
index c9f21ef..0000000
--- a/oss-pkg-AcroReaderDC.spec
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Spec file for AcroReaderDC
-# Copyright (c) 2018 Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
-#
-
-Name:         oss-pkg-AcroReaderDC
-Summary:      Package to install AcroReaderDC on OSS-Clients
-Version:      19.008.20071
-Release:      1
-License:      GPL-2.0
-Vendor:       Peter Varkoly and Helmuth Varkoly
-Packager:     peter@varkoly.de
-Group:        Productivity/
-Source:       %{name}.tar.bz2
-BuildArch:    noarch
-BuildRequires:unzip
-#Requires:     
-Requires:     filesystem
-PreReq:       salt-master
-PreReq:       %fillup_prereq
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-
-%description
-Package to install AcroReaderDC on OSS-Clients
-
-Authors:
---------
-        helmuth@varkoly.de
-        peter@varkoly.de
-
-
-%prep
-%setup -n %{name}
-
-%build
-
-%install
-
-mkdir -p %{buildroot}/srv/salt/win/repo-ng/AcroReaderDC
-mkdir -p %{buildroot}/srv/salt/packages/
-cp AcroReaderDC.sls  %{buildroot}/srv/salt/packages/
-cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/AcroReaderDC
-
-%clean
-rm -rf %{buildroot}
-
-%pre
-
-%post
-
-/usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"AcroReaderDC","manually":false,"description":"AcroReaderDC","softwareVersions":[{"version":"19.008.20071"}]}'
-
-%files
-%defattr(644,root,root)
-/srv/salt/win/repo-ng/AcroReaderDC
-/srv/salt/packages/AcroReaderDC.sls
-
-

diff --git a/oss-pkg-AcroReaderDC.spec.in b/oss-pkg-AcroReaderDC.spec.in
new file mode 100644 (file)
index 0000000..f3e7bdb
--- /dev/null
+++ b/oss-pkg-AcroReaderDC.spec.in
@@ -0,0 +1,58 @@
+#
+# Spec file for PACKAGE
+# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany.  All rights reserved.
+#
+
+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
+Group:        Productivity/
+Source:       %{name}.tar.bz2
+BuildArch:    noarch
+BuildRequires:unzip
+#Requires:     
+Requires:     filesystem
+PreReq:       salt-master
+PreReq:       %fillup_prereq
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+
+%description
+Package to install PACKAGE on OSS-Clients
+
+Authors:
+--------
+        helmuth@varkoly.de
+        peter@varkoly.de
+
+
+%prep
+%setup -n %{name}
+
+%build
+
+%install
+
+mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE
+mkdir -p %{buildroot}/srv/salt/packages/
+cp PACKAGE.sls  %{buildroot}/srv/salt/packages/
+cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE
+
+%clean
+rm -rf %{buildroot}
+
+%pre
+
+%post
+
+/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/7zip/HASH.json
+
+%files
+%defattr(644,root,root)
+/srv/salt/win/repo-ng/PACKAGE
+/srv/salt/packages/PACKAGE.sls
+
+