From: CEPHALIX GIT ADMIN Date: Fri, 18 Sep 2020 10:24:50 +0000 (+0200) Subject: initial version X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=eb469cac823bd571831f64be77c8d9ae8a142d15;p=ACDLabs2020_CHG.git initial version --- eb469cac823bd571831f64be77c8d9ae8a142d15 diff --git a/ACDLabs2020_CHG.sls b/ACDLabs2020_CHG.sls new file mode 100644 index 0000000..f452394 --- /dev/null +++ b/ACDLabs2020_CHG.sls @@ -0,0 +1,14 @@ +############################################################################### +# SLS: PACKAGE +# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany. +# All rights reserved. +# +# Author: Helmuth Varkoly +# +# Description: SLS to use with OSS's softwaremanagement +############################################################################### +PACKAGE: + pkg: + - installed + + diff --git a/FULLNAMES b/FULLNAMES new file mode 100644 index 0000000..a87d695 --- /dev/null +++ b/FULLNAMES @@ -0,0 +1 @@ +ACD/Labs 2020 Freeware in C:\Program Files\ACD2020FREE\ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c70fc0d --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd. \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c8bd7e5 --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +PACKAGE = $(shell basename `pwd` ) +DESTDIR = / +REPO = /srv/www/repo/TESTING/salt-packages/ +VERSION = $(shell cat VERSION ) +RELEASE = $(shell cat RELEASE ) +NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) +YEAR = $(shell date +%Y ) + +package: + 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 + ../oss-pkg-tools/create_hash.sh $(PACKAGE) + rm -rf oss-pkg-$(PACKAGE) + rm -rf repo-ng/repo-ng + mkdir -p oss-pkg-$(PACKAGE) + sed s/PACKAGE/$(PACKAGE)/g $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls + if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi + tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(PACKAGE) + rm -rf oss-pkg-$(PACKAGE) + mv oss-pkg-$(PACKAGE).tar.bz2 /usr/src/packages/SOURCES/ + rpmbuild -bb oss-pkg-$(PACKAGE).spec + find $(REPO)/noarch -name oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm* -exec rm {} \; + mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch + echo $(NRELEASE) > RELEASE + git commit -a -m "New release" + git push + createrepo $(REPO) + + diff --git a/RELEASE b/RELEASE new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/RELEASE @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..4b964e9 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +14.0.0 diff --git a/oss-pkg-ACDLabs2020_CHG.spec.in b/oss-pkg-ACDLabs2020_CHG.spec.in new file mode 100644 index 0000000..cd3e3f7 --- /dev/null +++ b/oss-pkg-ACDLabs2020_CHG.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/PACKAGE/HASH.json + +%files +%defattr(644,root,root) +/srv/salt/win/repo-ng/PACKAGE +/srv/salt/packages/PACKAGE.sls + + diff --git a/repo-ng/init.sls b/repo-ng/init.sls new file mode 100644 index 0000000..734f126 --- /dev/null +++ b/repo-ng/init.sls @@ -0,0 +1,22 @@ +############################################################################### +# SLS: ACDLabs 2020 +# Copyright (c) 2018 Helmuth Varkoly, Nuermberg, Germany. +# All rights reserved. +# +# Authors: Helmuth Varkoly +# +# Description: Package SLS +############################################################################### + + +ACDLabs2020_CHG: + '14.0.0': + full_name: 'ACD/Labs 2020 Freeware in C:\Program Files\ACD2020FREE\' + installer: salt://win/repo-ng/ACDLabs2020_CHG/script.msi + uninstaller: salt://win/repo-ng/ACDLabs2020_CHG/script.msi + install_flags: '/qn /l* "C:\salt\var\log\ACDLabs_inst.log"' + uninstall_flags: '/qn /l* "C:\salt\var\log\ACDLabs_uninst.log"' + msiexec: True + locale: de_DE + reboot: False + cache_dir: True diff --git a/repo-ng/script.msi b/repo-ng/script.msi new file mode 100755 index 0000000..b17498f Binary files /dev/null and b/repo-ng/script.msi differ diff --git a/repo-ng/script_0.cab b/repo-ng/script_0.cab new file mode 100755 index 0000000..e5f6ffd Binary files /dev/null and b/repo-ng/script_0.cab differ