From: Maximilian Grunow Date: Fri, 5 May 2023 20:48:21 +0000 (+0000) Subject: ♻️ updated to version 112.0.2 X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=2dc8bc4da76120ca7f0f43f95ebaafb665b78651;p=Firefox.git ♻️ updated to version 112.0.2 --- diff --git a/.gitignore b/.gitignore index 12b8d4b..6547b30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -packages.spec +repo-ng/HASH.json +repo-ng/init.sls +.DS_Store +oss-pkg-Firefox.spec diff --git a/Firefox.sls b/Firefox.sls index 2be747e..40c0faa 100644 --- a/Firefox.sls +++ b/Firefox.sls @@ -3,7 +3,7 @@ # Copyright (c) YEAR Helmuth Varkoly, Nuermberg, Germany. # All rights reserved. # -# Authos: Helmuth Varkoly +# Authos: Helmuth Varkoly, Maximilian Grunow # # Description: SLS to use with CRANIX's softwaremanagement ############################################################################### diff --git a/LICENSE b/LICENSE index 6723dbb..3da5fd9 100644 --- a/LICENSE +++ b/LICENSE @@ -1 +1 @@ -Copyright (c) 2022 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd. +Copyright (c) 2023 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd. diff --git a/Makefile b/Makefile index f30c3b1..7484884 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ REPO = /srv/www/repo/salt-packages/ VERSION = $(shell cat VERSION ) RELEASE = $(shell cat RELEASE ) NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) -YEAR = $(shell date +%Y ) +YEAR = $(shell date +%Y ) package: sed s/VERSION/$(VERSION)/g oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec @@ -27,18 +27,5 @@ package: 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) - #git push - -init: - rm -fr .git - mv oss-pkg-packages.spec.in oss-pkg-$(PACKAGE).spec.in - sed -i 's/PACKAGE/$(PACKAGE)/g' oss-pkg-$(PACKAGE).spec.in - mkdir repo-ng - sed -i 's/PACKAGE/$(PACKAGE)/g' init.sls.in - mv temlate.sls $(PACKAGE).sls - sed -i 's/PACKAGE/$(PACKAGE)/g' $(PACKAGE).sls - git init - git add . - git commit -am "Initial version of $(PACKAGE)" - echo "Do not forget to adapt VERSION and the FULLNAMES file" diff --git a/VERSION b/VERSION index 40847a2..8ea3d11 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -101.0.1 +112.0.2 \ No newline at end of file diff --git a/init.sls.in b/init.sls.in index 2263486..8d1b621 100644 --- a/init.sls.in +++ b/init.sls.in @@ -3,15 +3,10 @@ # Copyright (c) YEAR Helmuth Varkoly, Nuermberg, Germany. # All rights reserved. # -# Authors: Helmuth Varkoly +# Authors: Helmuth Varkoly, Maximilian Grunow # # Description: Package SLS ############################################################################### -{% if grains['cpuarch'] == 'AMD64' %} -{% set ARCH = "x64" %} -{% else %} -{% set ARCH = "x86" %} -{% endif %} {% set LOG_PATH = 'C:\\salt\\var\\log' %} diff --git a/oss-pkg-Firefox.spec.in b/oss-pkg-Firefox.spec.in index 4d732b6..91a3b39 100644 --- a/oss-pkg-Firefox.spec.in +++ b/oss-pkg-Firefox.spec.in @@ -4,7 +4,7 @@ # Name: oss-pkg-Firefox -Summary: Package to install Firefox on OSS-Clients +Summary: Package to install Firefox on CRANIX-Clients Version: VERSION Release: RELEASE License: GPL-2.0 diff --git a/repo-ng/Firefox_Setup_112.0.2.msi b/repo-ng/Firefox_Setup_112.0.2.msi new file mode 100644 index 0000000..1aad069 Binary files /dev/null and b/repo-ng/Firefox_Setup_112.0.2.msi differ