Skip to content

Commit 143c4bf

Browse files
m-kuhnm-kuhn
authoredOct 2, 2017
Merge pull request #5275 from daniviga/qgis3-rpm
Initial RPM sources update for QGIS3
·
ltr-3_40final-3_0_0
2 parents 2fa6811 + 524c791 commit 143c4bf

File tree

6 files changed

+181
-713
lines changed

6 files changed

+181
-713
lines changed
 

‎rpm/buildrpms.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ patch=$(grep -e 'SET(CPACK_PACKAGE_VERSION_PATCH' ../CMakeLists.txt |
9191

9292
version=$(echo $major.$minor.$patch)
9393

94+
timestamp=$(date +'%s')
95+
9496
print_info "Building version $version-$RELVER"
9597

9698
if [ "$build_only" -ne "1" ]
@@ -101,12 +103,13 @@ then
101103

102104
print_info "Creating source tarball"
103105
# Create source tarball
104-
git -C .. archive --format=tar --prefix=qgis-$version/ $BRANCH | bzip2 > sources/qgis-$version.tar.gz
106+
git -C .. archive --format=tar --prefix=qgis-$version/ $BRANCH | bzip2 > sources/qgis-$version.tar.bz2
105107

106108
print_info "Creating source package"
107109
# Create spec file
108110
cat qgis.spec.template | sed -e s/%{_version}/$version/g \
109111
| sed -e s/%{_relver}/$RELVER/g \
112+
| sed -e s/%{_timestamp}/$timestamp/g \
110113
| tee qgis.spec 1>/dev/null
111114
# Build source package
112115
mock --buildsrpm --spec qgis.spec --sources ./sources --define "_relver $RELVER" --define "_version $version" --resultdir=$OUTDIR

‎rpm/default.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ OUTDIR="result/"
1010

1111
# Which arches to build for. Check /etc/mock for possible options
1212
ARCHS=(
13-
"fedora-21-i386"
14-
"fedora-21-x86_64"
15-
"fedora-22-i386"
16-
"fedora-22-x86_64"
13+
"fedora-26-i386"
14+
"fedora-26-x86_64"
15+
"fedora-27-i386"
16+
"fedora-27-x86_64"
1717
)
1818

1919
# Which git branch to export. Normally take the current

‎rpm/qgis.spec.template

Lines changed: 154 additions & 694 deletions
Large diffs are not rendered by default.

‎rpm/sources/qgis-lib64.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
3+
--- cmake/PyQtMacros.cmake 2017-09-29 17:55:02.000000000 +0200
4+
+++ cmake/PyQtMacros.cmake.lib64 2017-09-30 18:32:30.277970717 +0200
5+
@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )
6+
ELSE(WIN32)
7+
# TODO osx
8+
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
9+
- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
10+
+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
11+
ENDIF(WIN32)
12+
13+
FOREACH(it ${ARGN})

‎rpm/sources/qgis-mime.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<comment xml:lang="de">QGIS-Projekt</comment>
77
<sub-class-of type="application/xml"/>
88
<alias type="application/x-qgis"/>
9+
<icon name="qgis-qgs"/>
910
<magic priority="50">
1011
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
1112
<match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -18,6 +19,7 @@
1819
<comment>QGIS layer settings</comment>
1920
<comment xml:lang="de">QGIS-Layereinstellungen</comment>
2021
<sub-class-of type="application/xml"/>
22+
<icon name="qgis-qml"/>
2123
<magic priority="50">
2224
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
2325
<match type="string" offset="0:256" value="&lt;qgis version"/>

‎rpm/sources/qgis-server-httpd.conf

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,17 @@
22
# It is not meant for productive use.
33

44
RewriteEngine on
5-
RewriteRule ^/wms/(.+)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
5+
RewriteRule ^/wms/(.*)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
66

77
ScriptAlias /qgis/ "/usr/libexec/qgis/"
88

9-
109
<Directory "/usr/libexec/qgis/">
1110

1211
Options ExecCGI
1312
Options FollowSymLinks
1413

1514
<IfModule mod_authz_core.c>
16-
# Apache 2.4
17-
Require local
18-
</IfModule>
19-
20-
<IfModule !mod_authz_core.c>
21-
# Apache 2.2
22-
Order deny,allow
23-
Deny from all
24-
Allow from 127.0.0.1
25-
Allow from ::1
26-
</IfModule>
27-
15+
# Apache 2.4
16+
Require local
17+
</IfModule>
2818
</Directory>

0 commit comments

Comments
 (0)
Please sign in to comment.