phyghtmap renamed, gdal package simplified

fedora/SPECS/gdal3.spec

@@ -6,12 +6,12 @@
 %define   _includedir %{_prefix}/include
 %define   _datadir %{_prefix}/share
 %define   _bindir %{_prefix}/bin
-%define   _libdir %{_prefix}/lib64
+%define   _libdir %{_prefix}/lib
 %define   _mandir %{_prefix}/man
 
 Name:     gdal3
 Version:  3.0.2
-Release:  1%{?dist}
+Release:  2%{?dist}
 #define debug_package #{nil}
 License:  MIT
 Group:    Applications/System
@@ -45,6 +45,7 @@ BuildRequires:	python3-numpy
 %endif
 BuildRequires:	sqlite-devel
 BuildRequires:	swig
+BuildRequires: /usr/bin/pathfix.py
 
 %global DONT_REMOVE_RPATH 1
 # don't check for rpath:
@@ -76,35 +77,74 @@ Summary:	GDAL file format library
 %description libs
 This package contains the GDAL file format library.
 
- simple service for looking up your IP address. This is the code that powers https://echoip.daniel-steiner.org.
+
+%package python-tools
+Summary:	GDAL python files
+
+%description python-tools
+This package contains the GDAL python files
+
 
 %prep
 %setup -q -n %{realname}-%{version}
 
+%if 0%{?fedora} > 31
+pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
+%else
+pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
+%endif
+	swig/python/scripts/epsg_tr.py \
+	swig/python/scripts/gdal2tiles.py \
+	swig/python/scripts/gdalchksum.py \
+	swig/python/scripts/gdalident.py \
+	swig/python/scripts/gdal_pansharpen.py \
+	swig/python/scripts/gdal_sieve.py \
+	swig/python/scripts/rgb2pct.py \
+	swig/python/scripts/esri2wkt.py \
+	swig/python/scripts/gdal2xyz.py \
+	swig/python/scripts/gdalcompare.py \
+	swig/python/scripts/gdalimport.py \
+	swig/python/scripts/gdal_polygonize.py \
+	swig/python/scripts/mkgraticule.py \
+	swig/python/scripts/gcps2vec.py \
+	swig/python/scripts/gdal_auth.py \
+	swig/python/scripts/gdal_edit.py \
+	swig/python/scripts/gdal_merge.py \
+	swig/python/scripts/gdal_proximity.py \
+	swig/python/scripts/ogrmerge.py \
+	swig/python/scripts/gcps2wld.py \
+	swig/python/scripts/gdal_calc.py \
+	swig/python/scripts/gdal_fillnodata.py \
+	swig/python/scripts/gdalmove.py \
+	swig/python/scripts/gdal_retile.py \
+	swig/python/scripts/pct2rgb.py
+
 %build
-./configure \
-	--datadir=%{_datadir}/%{realname} \
-	--includedir=%{_includedir}/%{realname} \
-	--prefix=%{_prefix}	\
-	--libdir=%{_libdir} \
-	--sysconfdir=%{_sysconfdir} \
-	--localstatedir=%{_var} \
-	--with-curl	\
-	--with-freexl	\
-	--with-geos \
-	--with-png=%{sysprefix} \
-	--with-gif \
-	--with-gta \
-	--with-jpeg \
-	--without-jpeg12 \
-	--with-liblzma \
-	--with-libtiff=%{sysprefix}	\
-	--with-libz \
-	--without-mdb \
-	--without-msg \
-	--with-proj=%{_prefix} \
-	--with-threads \
-	--enable-shared
+./configure --with-python
+#./configure \
+	#--datadir=%{_datadir}/%{realname} \
+	#--includedir=%{_includedir}/%{realname} \
+	#--prefix=%{_prefix}	\
+	#--libdir=%{_libdir} \
+	#--sysconfdir=%{_sysconfdir} \
+	#--localstatedir=%{_var} \
+	#--with-curl	\
+	#--with-freexl	\
+	#--with-geos \
+	#--with-png=%{sysprefix} \
+	#--with-gif \
+	#--with-gta \
+	#--with-jpeg \
+	#--without-jpeg12 \
+	#--with-liblzma \
+	#--with-libtiff=%{sysprefix}	\
+	#--with-libz \
+	#--without-mdb \
+	#--without-msg \
+	#--with-proj=%{_prefix} \
+	#--with-python \
+	#--with-threads \
+	#--enable-shared
 
 make
 
@@ -154,13 +194,20 @@ mv %{buildroot}%{_prefix}/etc %{buildroot}/
 
 %files devel
 %{_bindir}/%{realname}-config
-%{_includedir}/%{realname}/*.h
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{realname}.pc
 
+%files python-tools
+%{_bindir}/*.py
+%{_libdir}64/python*/site-packages/*
+
 %changelog
+* Sat Jan 11 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- Python scripts added
+
 * Wed Jan 8 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
 - Library path fixed.
 

fedora/SPECS/phyghtmap.spec

@@ -0,0 +1,52 @@
+Name:           phyghtmap
+Version:        2.21
+Release:        99%{?dist}
+Summary:        Generate OSM contour lines from NASA SRTM data
+License:        GPLv2+
+URL:            http://katze.tfiu.de/projects/phyghtmap/
+Source0:        http://katze.tfiu.de/projects/%{modname}/%{modname}_%{version}.orig.tar.gz
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%global _description\
+%{modname} is a little program which lets you easily generate OSM contour\
+lines from NASA SRTM data.\
+
+
+%description %_description
+
+%package
+Summary: %summary
+Requires:       python3-numpy
+Requires:       python3-beautifulsoup4
+Requires:       python3-matplotlib
+%{?python_provide:%python_provide python3-phyghtmap}
+
+%description
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+%py3_build
+
+
+%install
+%py3_install
+install -Dpm 644 docs/%{modname}.1 %{buildroot}%{_mandir}/man1/%{modname}.1
+
+
+%files
+%doc README LICENSE_GPL-2 COPYRIGHT Changelog
+%{_bindir}/%{modname}
+%{_mandir}/man1/%{modname}.1*
+%{python3_sitelib}/%{modname}/
+%{python3_sitelib}/%{modname}-%{version}-py*.egg-info/
+
+%changelog
+* Sat Jan 11 2020 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- Initial build
+