another fix

diff --git a/Makefile b/Makefile
index 1d759aa4b3f7613ea84c728d8d57baf4051794ab..ad287cc2d7c36e66ac0f256c34dfcde4858aca9e 100644 (file)
--- 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
        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)
 
 
        createrepo $(REPO)
 
 

diff --git a/RELEASE b/RELEASE
index d00491fd7e5bb6fa28c517a0bb32b8b506539d4d..0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1
+2

diff --git a/oss-pkg-PhotoScape.spec b/oss-pkg-PhotoScape.spec
index dcfa0c321827fbb413ee0ace52c03e7e8783a18d..3b1cf9150ab023ef644dd0a08c2076323c36a54f 100644 (file)
--- 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
 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
 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 159f30adde8920b4c381de6131782baf2d5af498..b7e26e720eb1d911d9f757944cd6c4256f12f36a 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -14,7 +14,7 @@
 PhotoScape:
   '3.7':
     full_name: 'PhotoScape'
 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'
     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 1908a671d8776e9e529286a76f945118c483cb0e..777f4fab881d8d9ca6a0405d59a9a5275721fa06 100644 (file)
--- a/repo-ng/install.bat
+++ b/repo-ng/install.bat
@@ -1,6 +1,6 @@
 @echo off
 
 cd %~dp0
 @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
 
 reg add HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\PhotoScape /v DisplayVersion /d "3.7" /F