rpms
/
gdal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New Ruby guidelines, webp, correct private provides

This commit is contained in:
Volker Fröhlich 2012-05-10 01:30:41 +02:00
parent de57f70cb0
commit f0b6397233
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gdal.spec
View File

@ -88,6 +88,7 @@ BuildRequires: libspatialite-devel
%endif %endif
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: giflib-devel BuildRequires: giflib-devel
BuildRequires: netcdf-devel BuildRequires: netcdf-devel
@ -137,12 +138,6 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
%endif %endif
# Don't provide private Python and Perl extension libs
%{?filter_setup:
%filter_provides_in %{python_sitearch}/.*\.so %{_libdir}/perl5/.*\.so$
%filter_setup
}
#TODO: Description on the lib? #TODO: Description on the lib?
%description %description
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
@ -257,6 +252,9 @@ BuildArch: noarch
%description doc %description doc
This package contains HTML and PDF documentation for GDAL. This package contains HTML and PDF documentation for GDAL.
# We don't want to provide private Python extension libs
%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
%prep %prep
%setup -q -n %{name}-%{version}-fedora %setup -q -n %{name}-%{version}-fedora
@ -368,8 +366,6 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
# For future reference: # For future reference:
# epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024 # epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024
# webp: Stalled review, some movement lately -- https://bugzilla.redhat.com/show_bug.cgi?id=707389
# libgta https://bugzilla.redhat.com/show_bug.cgi?id=783778
# openjpeg 2.0 necessary, 1.4 is in Fedora # openjpeg 2.0 necessary, 1.4 is in Fedora
# Building without pgeo driver, because it drags in Java # Building without pgeo driver, because it drags in Java
@ -399,7 +395,7 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
--with-liblzma \ --with-liblzma \
--with-libtiff=external \ --with-libtiff=external \
--with-libz \ --with-libz \
--without-mdb \ --without-mdb \
--with-mysql \ --with-mysql \
--with-netcdf \ --with-netcdf \
--with-odbc \ --with-odbc \
@ -413,6 +409,7 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
%{spatialite} \ %{spatialite} \
--with-sqlite3 \ --with-sqlite3 \
--with-threads \ --with-threads \
--with-webp \
--with-xerces \ --with-xerces \
--enable-shared \ --enable-shared \
--with-ruby \ --with-ruby \
@ -773,19 +770,21 @@ rm -rf %{buildroot}
#Download jackcess-1.2.2.jar, commons-lang-2.4.jar and #Download jackcess-1.2.2.jar, commons-lang-2.4.jar and
#commons-logging-1.1.1.jar (other versions might work) #commons-logging-1.1.1.jar (other versions might work)
#If you didn't specify --with-jvm-lib-add-rpath at #If you didn't specify --with-jvm-lib-add-rpath at
#oder, wie gehabt mit ldconfig #Or as before, using ldconfig
%changelog %changelog
* Wed Apr 25 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.0-2 * Thu May 10 2012 Volker Fröhlich <volker27@gmx.at> - 1.9.0-3
- Rebuild for cfitsio 3.300 - Correct provides-filtering as of https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage
- Support webp
* Sun Feb 26 2012 Volker Fröhlich <volker27@gmx.at> - 1.9.0-1
- Remove bogus libjpeg-turbo conditional - Remove bogus libjpeg-turbo conditional
- Update Ruby ABI version to 1.9.1 - Update Ruby ABI version to 1.9.1
- Install Ruby bindings to vendorarchdir on F17 and later - Install Ruby bindings to vendorarchdir on F17 and later
- Conditionals for Ruby specific elements for versions prior F17 and for EPEL - Conditionals for Ruby specific elements for versions prior F17 and for EPEL
- Correct quotes for CFLAGS and Ruby - Correct quotes for CFLAGS and Ruby
* Wed Apr 25 2012 Orion Poplawski <orion@cora.nwra.com> - 1.9.0-2
- Rebuild for cfitsio 3.300
* Sun Feb 26 2012 Volker Fröhlich <volker27@gmx.at> - 1.9.0-1 * Sun Feb 26 2012 Volker Fröhlich <volker27@gmx.at> - 1.9.0-1
- Completely re-work the original spec-file - Completely re-work the original spec-file
The major changes are: The major changes are: