Compare commits
No commits in common. "4e926504021313b2b9491296205405499c4876c5" and "fd60ac752f6c0d2f819db73cf2a508c915d3e6b0" have entirely different histories.
4e92650402
...
fd60ac752f
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -28,5 +28,3 @@ qgis_1.5.0.tar.gz
|
|||
/qgis-2.16.2.tar.bz2
|
||||
/qgis-2.16.3.tar.bz2
|
||||
/qgis-2.18.0.tar.bz2
|
||||
/qgis-2.18.1.tar.bz2
|
||||
/qgis-2.18.2.tar.bz2
|
||||
|
|
24
qgis.spec
24
qgis.spec
|
@ -18,7 +18,7 @@
|
|||
#TODO: Run test suite (see debian/rules)
|
||||
|
||||
Name: qgis
|
||||
Version: 2.18.2
|
||||
Version: 2.18.0
|
||||
Release: 1%{?dist}
|
||||
Summary: A user friendly Open Source Geographic Information System
|
||||
Group: Applications/Engineering
|
||||
|
@ -100,7 +100,6 @@ BuildRequires: sqlite-devel
|
|||
#BuildRequires: xorg-x11-server-Xvfb
|
||||
|
||||
Requires: gpsbabel
|
||||
# As found in BZ#1396818
|
||||
Requires: qca-ossl
|
||||
|
||||
# We don't want to provide private Python extension libs
|
||||
|
@ -208,8 +207,8 @@ gzip ChangeLog
|
|||
|
||||
%build
|
||||
|
||||
# Necessary for the test suite
|
||||
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
|
||||
# Necessary to compile python libs
|
||||
export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/output/%{_lib}
|
||||
|
||||
#TODO: If for EPEL (osgearth, touch)
|
||||
#Info: TOUCH needs Qt >= 4.5
|
||||
|
@ -249,8 +248,6 @@ make %{?_smp_mflags}
|
|||
|
||||
|
||||
%install
|
||||
# Necessary for the test suite
|
||||
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
# Install desktop file without connecting proprietary file types
|
||||
|
@ -408,15 +405,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 16 2016 Volker Froehlich <volker27@gmx.at> - 2.18.2-1
|
||||
- New upstream release
|
||||
|
||||
* Sat Nov 26 2016 Volker Froehlich <volker27@gmx.at> - 2.18.1-1
|
||||
- New upstream release
|
||||
|
||||
* Sun Nov 20 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-2
|
||||
- Add qca-ossl to Requires, as of BZ#1396818
|
||||
|
||||
* Fri Oct 21 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-1
|
||||
- New upstream release
|
||||
|
||||
|
@ -440,9 +428,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14.3-4
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Tue Jul 12 2016 Daniele Viganò <daniele@vigano.me> - 2.16.0-1
|
||||
- New upstream release
|
||||
|
||||
* Tue Jun 07 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-3
|
||||
- Version bump to be newer than F24
|
||||
|
||||
* Mon Jun 06 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-3
|
||||
- Grass version in F24 is 7.0.3 for now
|
||||
|
||||
* Mon Jun 06 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-2
|
||||
- Move grass version to BR. This will avoid building with a
|
||||
different version than intended. The sub-package dependencies
|
||||
|
|
Reference in New Issue
Block a user