Ver 1.2.13

davidbannon · Jun 14, 2023 · 1a13e28 · 1a13e28
1 parent f5f427d
commit 1a13e28
Show file tree

Hide file tree

Showing 14 changed files with 15,236 additions and 14 deletions.
diff --git a/cbindings/Qt5Pas.pro b/cbindings/Qt5Pas.pro
@@ -1,5 +1,5 @@
 #******************************************************************************
-#  Copyright (c) 2005-2022 by Jan Van hijfte, Željan Rikalo
+#  Copyright (c) 2005-2023 by Jan Van hijfte, Željan Rikalo
 #  
 #  See the included file COPYING.TXT for details about the copyright.
 #
@@ -10,13 +10,13 @@
 
 
 
-# Binding Release Version 1.2.12 against Qt5 5.6 LTS release.
+# Binding Release Version 1.2.13 against Qt5 5.6 LTS release.
 # WebKit widgets are disabled until webenginewidgets are implemented.
 
-VERSION = 1.2.12
+VERSION = 1.2.13
 VER_MAJ = 1
 VER_MIN = 2
-VER_PAT = 12
+VER_PAT = 13
 win32:VERSION_PE_HEADER = 1.2
 
 QT += gui network printsupport

diff --git a/cbindings/package/libqt5pas.spec b/cbindings/package/libqt5pas.spec
@@ -23,7 +23,7 @@ Lazarus main, current release versions do not need it.
 
 %files
 
-/usr/%{_lib}/libQt5Pas.so.1.2.12
+/usr/%{_lib}/libQt5Pas.so.1.2.INSERT_EXTRAVER
 /usr/%{_lib}/libQt5Pas.so.1.2
 /usr/%{_lib}/libQt5Pas.so.1
 %dir "/usr/share/doc/libqt5pas/"

diff --git a/cbindings/package/rpm-package b/cbindings/package/rpm-package
@@ -80,8 +80,13 @@ function MakeRPM () {
 	sed -i "s/^Version:*./Version: ${VERSION}/" "$RDIR"/"$PRODUCT".spec
 	sed -i "s/^Release:*./Release: ${PACKVER}/" "$RDIR"/"$PRODUCT".spec
 	sed -i "s/INSERT_FULL_VER/Version: ${FULLVER}/" "$RDIR"/"$PRODUCT".spec
+    sed -i "s/INSERT_EXTRAVER/${EXTRAVER}/" "$RDIR"/"$PRODUCT".spec
 	cp "$RDIR"/"$PRODUCT".spec "$PRODUCT""$1".spec-just-used
 	cd "$RDIR"
+
+echo "------ In Make RPM, done stuff, arch=$M_ARCH, current=$CURRENT, rdir=$RDIR, product=$PRODUCT"
+
+
 	fakeroot rpmbuild --target "$M_ARCH" --buildroot "$CURRENT"/"$RDIR" -bb "$PRODUCT".spec
 	cd .. 
 }
@@ -112,8 +117,11 @@ function SetUpArch () {
 
 
 SetUpArch
+echo "Arch setup version=$VERSION"
 MakeRPM   
+echo "MakeRPM version=$VERSION"
 MakeRPM "devel" 
+echo "MakeDev version=$VERSION"
 
 rpmlint -i *.rpm