From d989cb9f535692e29a51e84d67e1b8f0b6a0114c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 13 Jun 2022 10:18:05 +0200 Subject: [PATCH] another fix --- Makefile | 4 ++-- RELEASE | 2 +- oss-pkg-PhotoScape.spec | 2 +- repo-ng/init.sls | 2 +- repo-ng/install.bat | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1d759aa..ad287cc 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ package: 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 +# git commit -a -m "New release" +# git push createrepo $(REPO) diff --git a/RELEASE b/RELEASE index d00491f..0cfbf08 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -1 +2 diff --git a/oss-pkg-PhotoScape.spec b/oss-pkg-PhotoScape.spec index dcfa0c3..3b1cf91 100644 --- a/oss-pkg-PhotoScape.spec +++ b/oss-pkg-PhotoScape.spec @@ -6,7 +6,7 @@ Name: oss-pkg-PhotoScape Summary: Package to install PhotoScape on OSS-Clients Version: 3.7 -Release: 1 +Release: 2 License: GPL-2.0 Vendor: Peter Varkoly and Helmuth Varkoly Packager: peter@varkoly.de diff --git a/repo-ng/init.sls b/repo-ng/init.sls index 159f30a..b7e26e7 100644 --- a/repo-ng/init.sls +++ b/repo-ng/init.sls @@ -14,7 +14,7 @@ PhotoScape: '3.7': full_name: 'PhotoScape' - installer: salt://win/repo-ng/Photoscape/install.bat + installer: salt://win/repo-ng/PhotoScape/install.bat install_flags: '/S' uninstaller: '%programfiles(x86)%\Photoscape\uninstall.exe' uninstall_flags: '/S' diff --git a/repo-ng/install.bat b/repo-ng/install.bat index 1908a67..777f4fa 100644 --- a/repo-ng/install.bat +++ b/repo-ng/install.bat @@ -1,6 +1,6 @@ @echo off cd %~dp0 -./PhotoScapeSetup_V3.7.exe /S +PhotoScapeSetup_V3.7.exe /S reg add HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\PhotoScape /v DisplayVersion /d "3.7" /F -- 2.43.0