diff --git a/.gitignore b/.gitignore index 283912f..81bbb1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -ogdi-3.2.0.beta2.tar.gz -ogdi.pdf -/ogdi-3.2.0.tar.gz -/ogdi-3.2.1.tar.gz -/ogdi_4_1_0.tar.gz +SOURCES/ogdi_4_1_1.tar.gz diff --git a/.ogdi.metadata b/.ogdi.metadata new file mode 100644 index 0000000..6ef178a --- /dev/null +++ b/.ogdi.metadata @@ -0,0 +1 @@ +5e5bc28efd9c7bcd958416d58d1a6a8ac5c19bf5 SOURCES/ogdi_4_1_1.tar.gz diff --git a/ogdi-4.1.0-sailer.patch b/SOURCES/ogdi-4.1.0-sailer.patch similarity index 100% rename from ogdi-4.1.0-sailer.patch rename to SOURCES/ogdi-4.1.0-sailer.patch diff --git a/SOURCES/ogdi.pdf b/SOURCES/ogdi.pdf new file mode 100644 index 0000000..59e8919 Binary files /dev/null and b/SOURCES/ogdi.pdf differ diff --git a/ogdi.spec b/SPECS/ogdi.spec similarity index 73% rename from ogdi.spec rename to SPECS/ogdi.spec index da7f16c..01ddaa9 100644 --- a/ogdi.spec +++ b/SPECS/ogdi.spec @@ -1,25 +1,28 @@ -%global gittag 4_1_0 +%global gittag 4_1_1 Name: ogdi -Version: 4.1.0 -Release: 7%{?dist} +Version: 4.1.1 +Release: 3%{?dist} Summary: Open Geographic Datastore Interface -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://ogdi.sourceforge.net/ # new project location is https://github.com/libogdi/ogdi Source0: https://github.com/libogdi/ogdi/archive/%{name}_%{gittag}.tar.gz Source1: http://ogdi.sourceforge.net/ogdi.pdf # https://bugzilla.redhat.com/show_bug.cgi?id=1470896 -Patch0: ogdi-%{version}-sailer.patch +Patch0: ogdi-4.1.0-sailer.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc -BuildRequires: unixODBC-devel BuildRequires: zlib-devel BuildRequires: expat-devel BuildRequires: tcl-devel BuildRequires: libtirpc-devel +# ODBC driver has been removed in 4.1.1 without replacement +Obsoletes: %{name}-odbc < 4.1.1 + %description OGDI is the Open Geographic Datastore Interface. OGDI is an application programming interface (API) that uses a standardized @@ -41,14 +44,6 @@ Requires: zlib-devel expat-devel OGDI header files and developer's documentation. -%package odbc -Summary: ODBC driver for OGDI -Requires: %{name} = %{version}-%{release} - -%description odbc -ODBC driver for OGDI. - - %package tcl Summary: TCL wrapper for OGDI Requires: %{name} = %{version}-%{release} @@ -63,6 +58,10 @@ TCL wrapper for OGDI. # include documentation %{__cp} -p %{SOURCE1} . +# remove unbundled stuff +rm -rf external +sed -i '/^subdirs/s/external //' makefile + %build TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET @@ -88,9 +87,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DDONT_TD_VOID -DUSE_TERMIO" # build contributions %{__make} -C contrib/gdal -# build odbc drivers -%{__make} -C ogdi/attr_driver/odbc \ - ODBC_LINKLIB="-lodbc" %install # export env @@ -106,8 +102,6 @@ TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET INST_LIB=%{buildroot}%{_libdir} %{__make} install -C contrib/gdal \ INST_LIB=%{buildroot}%{_libdir} -%{__make} install -C ogdi/attr_driver/odbc \ - INST_LIB=%{buildroot}%{_libdir} # remove example binary %{__rm} %{buildroot}%{_bindir}/example? @@ -150,7 +144,6 @@ touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config %{_bindir}/ogdi_* %{_libdir}/libogdi.so.* %dir %{_libdir}/ogdi -%exclude %{_libdir}/%{name}/liblodbc.so %exclude %{_libdir}/%{name}/libecs_tcl.so %{_libdir}/%{name}/lib*.so @@ -165,14 +158,42 @@ touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config %{_includedir}/%{name}/*.h %{_libdir}/libogdi.so -%files odbc -%{_libdir}/%{name}/liblodbc.so - %files tcl %{_libdir}/%{name}/libecs_tcl.so %changelog +* Sat Dec 28 2024 Arkady L. Shane - 4.1.1-3 +- Rebuilt for MSVSphere 10 + +* Mon Sep 02 2024 Miroslav Suchý - 4.1.1-3 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 4.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 01 2024 Dan Horák - 4.1.1-1 +- Update to 4.1.1 (fixes rhbz#2261412) +- Remove odbc subpackage + +* Thu Jan 25 2024 Fedora Release Engineering - 4.1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 4.1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 4.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Feb 05 2023 Florian Weimer - 4.1.0-10 +- Fix C99 compatibility issue + +* Thu Jan 19 2023 Fedora Release Engineering - 4.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 4.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 4.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources deleted file mode 100644 index f2a1db8..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (ogdi.pdf) = cfa693cee3eb43499fac5ef3771b47bd2ca617f48ad5f34e8461e63d19b41e54382916f980892d7afaec9deee4b28d0ef6383214c33f88ec7daaf80afd740aca -SHA512 (ogdi_4_1_0.tar.gz) = b5e0f5a537baf400a5a36c65fa5b18234a5993332ee8d0ee519c583ec4fc2442efff20188d67596c9a019518197982e50c32427911b27d85df34c0187ed9849b