diff --git a/.gitignore b/.gitignore index c6dddf7..283912f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/ogdi-3.2.1-cleanup.patch b/ogdi-3.2.1-cleanup.patch deleted file mode 100644 index c24403b..0000000 --- a/ogdi-3.2.1-cleanup.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/aclocal.m4 b/acinclude.m4 -similarity index 88% -rename from aclocal.m4 -rename to acinclude.m4 -index 163a446..9d3308e 100644 ---- a/aclocal.m4 -+++ b/acinclude.m4 -@@ -1,4 +1,4 @@ --AC_DEFUN(AC_COMPILER_WFLAGS, -+AC_DEFUN([AC_COMPILER_WFLAGS], - [ - # Remove -g from compile flags, we will add via CFG variable if - # we need it. -@@ -8,17 +8,17 @@ AC_DEFUN(AC_COMPILER_WFLAGS, - # check for GNU compiler, and use -Wall - if test "$GCC" = "yes"; then - C_WFLAGS="-Wall" -- AC_DEFINE(USE_GNUCC) -+ AC_DEFINE([USE_GNUCC]) - fi - if test "$GXX" = "yes"; then - CXX_WFLAGS="-Wall" -- AC_DEFINE(USE_GNUCC) -+ AC_DEFINE([USE_GNUCC]) - fi -- AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS) -- AC_SUBST(C_WFLAGS,$C_WFLAGS) -+ AC_SUBST([CXX_WFLAGS],$CXX_WFLAGS) -+ AC_SUBST([C_WFLAGS],$C_WFLAGS) - ]) - --AC_DEFUN(AC_COMPILER_PIC, -+AC_DEFUN([AC_COMPILER_PIC], - [ - echo 'void f(){}' > conftest.c - if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then -@@ -33,8 +33,8 @@ AC_DEFUN(AC_COMPILER_PIC, - fi - rm -f conftest* - -- AC_SUBST(CXX_PIC,$CXX_PIC) -- AC_SUBST(C_PIC,$C_PIC) -+ AC_SUBST([CXX_PIC],$CXX_PIC) -+ AC_SUBST([C_PIC],$C_PIC) - ]) - - dnl -@@ -42,7 +42,7 @@ dnl Try to find something to link shared libraries with. Use "c++ -shared" - dnl in preference to "ld -shared" because it will link in required c++ - dnl run time support for us. - dnl --AC_DEFUN(AC_LD_SHARED, -+AC_DEFUN([AC_LD_SHARED], - [ - echo 'void g(); int main(){ g(); return 0; }' > conftest1.c - -@@ -88,7 +88,7 @@ AC_DEFUN(AC_LD_SHARED, - fi - rm -f conftest* libconftest* - -- AC_SUBST(LD_SHARED,$LD_SHARED) -+ AC_SUBST([LD_SHARED],$LD_SHARED) - ]) - - -diff --git a/config/generic.mak.in b/config/generic.mak.in -index 699166b..355a53a 100644 ---- a/config/generic.mak.in -+++ b/config/generic.mak.in -@@ -35,10 +35,10 @@ AR = ar cr - # Compilation and linking flags - # - SHLIB_CFLAGS = @C_PIC@ --COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 -+COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ - - SHLIB_LDFLAGS = -shared --COMMON_LDFLAGS = $(OPTIMIZATION) -+COMMON_LDFLAGS = $(OPTIMIZATION) @LDFLAGS@ - - RPC_INCLUDES = @RPC_INCLUDES@ - diff --git a/ogdi-3.2.1-rpc-flags.patch b/ogdi-3.2.1-rpc-flags.patch deleted file mode 100644 index 896502a..0000000 --- a/ogdi-3.2.1-rpc-flags.patch +++ /dev/null @@ -1,37 +0,0 @@ -From eca8d50827e2085df41950117bc295ec99ebdfaf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Wed, 4 Apr 2018 10:51:03 +0200 -Subject: [PATCH] set CPPFLAGS so check for rpc/pmap_clnt.h doesn't fail when - libtirpc is used - ---- - configure | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 54a75c0..c7dfbea 100755 ---- a/configure -+++ b/configure -@@ -3689,7 +3689,7 @@ else - RPC_LIBS=$pkg_cv_RPC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- -+ CPPFLAGS="$CPPFLAGS $RPC_CFLAGS" - fi - fi - -diff --git a/configure.in b/configure.in -index ccdc7f3..8aae6e4 100644 ---- a/configure.in -+++ b/configure.in -@@ -43,7 +43,7 @@ dnl --------------------------------------------------------------------------- - dnl Do we have rpc/rpc.h - dnl --------------------------------------------------------------------------- - AC_CHECK_HEADERS([rpc/rpc.h],, -- [PKG_CHECK_MODULES([RPC], [libtirpc])]) -+ [PKG_CHECK_MODULES([RPC], [libtirpc], [CPPFLAGS="$CPPFLAGS $RPC_CFLAGS"])]) - - dnl --------------------------------------------------------------------------- - dnl Do we have rpc/pmap_clnt.h, float.h, dlfcn.h? diff --git a/ogdi-3.2.1-rpc.patch b/ogdi-3.2.1-rpc.patch deleted file mode 100644 index 6402a2b..0000000 --- a/ogdi-3.2.1-rpc.patch +++ /dev/null @@ -1,387 +0,0 @@ -From f37ca84ec1e2ef8e252cf2d047b14eb787eefd76 Mon Sep 17 00:00:00 2001 -From: Dennis Schridde -Date: Tue, 28 Nov 2017 23:25:41 +0100 -Subject: [PATCH] Fall back to libtirpc if libc does not provide rpc/rpc.h - ---- - config/generic.mak.in | 4 +- - configure | 245 +++++++++++++++++++++++++++++++++++++++++++++++++- - configure.in | 6 ++ - ogdi-config.in | 4 +- - ogdi.pc.in | 4 +- - 5 files changed, 255 insertions(+), 8 deletions(-) - -diff --git a/config/generic.mak.in b/config/generic.mak.in -index 355a53a..12a15ce 100644 ---- a/config/generic.mak.in -+++ b/config/generic.mak.in -@@ -35,7 +35,7 @@ AR = ar cr - # Compilation and linking flags - # - SHLIB_CFLAGS = @C_PIC@ --COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ -+COMMON_CFLAGS = $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ @RPC_CFLAGS@ - - SHLIB_LDFLAGS = -shared - COMMON_LDFLAGS = $(OPTIMIZATION) @LDFLAGS@ -@@ -61,7 +61,7 @@ INST_BIN = @bindir@ - # - #RPC_LINKLIB = -lrpcsvc -lnsl -lsocket - #RPC_LINKLIB = -ldl -ldbmalloc --RPC_LINKLIB = @LIBS@ -+RPC_LINKLIB = @LIBS@ @RPC_LIBS@ - - # - # Endian definition, could be little or big -diff --git a/configure b/configure -index c69d337..54a75c0 100755 ---- a/configure -+++ b/configure -@@ -634,6 +634,8 @@ PROJ_INCLUDE - PROJ_SETTING - BIG_ENDIAN - RPC_INCLUDES -+RPC_LIBS -+RPC_CFLAGS - EGREP - GREP - CPP -@@ -643,6 +645,9 @@ CXX_PIC - C_WFLAGS - CXX_WFLAGS - HAVE_ICONV -+PKG_CONFIG_LIBDIR -+PKG_CONFIG_PATH -+PKG_CONFIG - OBJEXT - EXEEXT - ac_ct_CC -@@ -715,7 +720,12 @@ CFLAGS - LDFLAGS - LIBS - CPPFLAGS --CPP' -+PKG_CONFIG -+PKG_CONFIG_PATH -+PKG_CONFIG_LIBDIR -+CPP -+RPC_CFLAGS -+RPC_LIBS' - - - # Initialize some variables set by options. -@@ -1355,7 +1365,14 @@ Some influential environment variables: - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory -+ PKG_CONFIG path to pkg-config utility -+ PKG_CONFIG_PATH -+ directories to add to pkg-config's search path -+ PKG_CONFIG_LIBDIR -+ path overriding pkg-config's built-in search path - CPP C preprocessor -+ RPC_CFLAGS C compiler flags for RPC, overriding pkg-config -+ RPC_LIBS linker flags for RPC, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -2879,6 +2896,126 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -+ -+ -+ -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_PKG_CONFIG+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG -+if test -n "$PKG_CONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -+$as_echo "$PKG_CONFIG" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ -+fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+if test -n "$ac_pt_PKG_CONFIG"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -+$as_echo "$ac_pt_PKG_CONFIG" >&6; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_pt_PKG_CONFIG" = x; then -+ PKG_CONFIG="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+ fi -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=0.9.0 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ PKG_CONFIG="" -+ fi -+fi -+ -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } - if ${ac_cv_lib_dl_dlopen+:} false; then : -@@ -3057,7 +3194,6 @@ HAVE_ICONV=$HAVE_ICONV - - - -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -3455,6 +3591,111 @@ fi - done - - -+for ac_header in rpc/rpc.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default" -+if test "x$ac_cv_header_rpc_rpc_h" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_RPC_RPC_H 1 -+_ACEOF -+ -+else -+ -+pkg_failed=no -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtirpc" >&5 -+$as_echo_n "checking for libtirpc... " >&6; } -+ -+if test -n "$RPC_CFLAGS"; then -+ pkg_cv_RPC_CFLAGS="$RPC_CFLAGS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_RPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+if test -n "$RPC_LIBS"; then -+ pkg_cv_RPC_LIBS="$RPC_LIBS" -+ elif test -n "$PKG_CONFIG"; then -+ if test -n "$PKG_CONFIG" && \ -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then -+ pkg_cv_RPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes -+else -+ pkg_failed=yes -+fi -+ else -+ pkg_failed=untried -+fi -+ -+ -+ -+if test $pkg_failed = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi -+ if test $_pkg_short_errors_supported = yes; then -+ RPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1` -+ else -+ RPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$RPC_PKG_ERRORS" >&5 -+ -+ as_fn_error $? "Package requirements (libtirpc) were not met: -+ -+$RPC_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+Alternatively, you may set the environment variables RPC_CFLAGS -+and RPC_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details." "$LINENO" 5 -+elif test $pkg_failed = untried; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+Alternatively, you may set the environment variables RPC_CFLAGS -+and RPC_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details. -+ -+To get pkg-config, see . -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ RPC_CFLAGS=$pkg_cv_RPC_CFLAGS -+ RPC_LIBS=$pkg_cv_RPC_LIBS -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ -+fi -+fi -+ -+done -+ -+ - for ac_header in rpc/pmap_clnt.h float.h dlfcn.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -diff --git a/configure.in b/configure.in -index 0a1526b..ccdc7f3 100644 ---- a/configure.in -+++ b/configure.in -@@ -23,6 +23,7 @@ fi - - dnl Checks for programs. - AC_PROG_CC -+PKG_PROG_PKG_CONFIG - - dnl We always want to check /usr/local for stuff. - dnl LIBS="$LIBS -L/usr/local/lib" -@@ -38,6 +39,11 @@ AC_COMPILER_WFLAGS - AC_COMPILER_PIC - AC_LD_SHARED - -+dnl --------------------------------------------------------------------------- -+dnl Do we have rpc/rpc.h -+dnl --------------------------------------------------------------------------- -+AC_CHECK_HEADERS([rpc/rpc.h],, -+ [PKG_CHECK_MODULES([RPC], [libtirpc])]) - - dnl --------------------------------------------------------------------------- - dnl Do we have rpc/pmap_clnt.h, float.h, dlfcn.h? -diff --git a/ogdi-config.in b/ogdi-config.in -index f3c9a03..c6dfc50 100644 ---- a/ogdi-config.in -+++ b/ogdi-config.in -@@ -13,8 +13,8 @@ exec_prefix="@exec_prefix@" - libdir="@libdir@" - includedir="@includedir@/ogdi" - libs="-logdi" --all_libs="-logdi -lproj -lexpat -lz" --I_opts="-I${includedir}" -+all_libs="-logdi -lproj -lexpat -lz @RPC_LIBS@" -+I_opts="-I${includedir} @RPC_CFLAGS@" - L_opts="" - R_opts="" - cppflags="" -diff --git a/ogdi.pc.in b/ogdi.pc.in -index 8b919de..1f290d9 100644 ---- a/ogdi.pc.in -+++ b/ogdi.pc.in -@@ -6,7 +6,7 @@ includedir=@includedir@ - Name: ogdi - Description: Open Geographic Datastore Interface - Version: @OGDI_VERSION@ --Cflags: -I${includedir}/ogdi -+Cflags: -I${includedir}/ogdi @RPC_CFLAGS@ - Libs: -L${libdir} -logdi --Libs.private: -lproj -lexpat -lz -+Libs.private: -lproj -lexpat -lz @RPC_LIBS@ - diff --git a/ogdi-3.2.0.beta2-sailer.patch b/ogdi-4.1.0-sailer.patch similarity index 100% rename from ogdi-3.2.0.beta2-sailer.patch rename to ogdi-4.1.0-sailer.patch diff --git a/ogdi.spec b/ogdi.spec index a40b416..2b7df56 100644 --- a/ogdi.spec +++ b/ogdi.spec @@ -1,29 +1,24 @@ -%define gittag %(echo %{name}_%{version} | sed 's/\\./_/g') - -Name: ogdi -Version: 3.2.1 -Release: 5%{?dist} -Summary: Open Geographic Datastore Interface -License: BSD -URL: http://ogdi.sourceforge.net/ +%global gittag 4_1_0 + +Name: ogdi +Version: 4.1.0 +Release: 1%{?dist} +Summary: Open Geographic Datastore Interface +License: BSD +URL: http://ogdi.sourceforge.net/ # new project location is https://github.com/libogdi/ogdi -Source0: https://github.com/libogdi/ogdi/archive/%{gittag}.tar.gz#/%{name}-%{version}.tar.gz -Source1: http://ogdi.sourceforge.net/ogdi.pdf +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-3.2.0.beta2-sailer.patch -# adapt to https://fedoraproject.org/wiki/Changes/SunRPCRemoval -# https://github.com/libogdi/ogdi/pull/6 -Patch1: ogdi-3.2.1-cleanup.patch -Patch2: ogdi-3.2.1-rpc.patch -Patch3: ogdi-3.2.1-rpc-flags.patch - -BuildRequires: gcc -BuildRequires: unixODBC-devel -BuildRequires: zlib-devel -BuildRequires: expat-devel -BuildRequires: proj-devel -BuildRequires: tcl-devel -BuildRequires: libtirpc-devel +Patch0: ogdi-%{version}-sailer.patch + +BuildRequires: gcc +BuildRequires: unixODBC-devel +BuildRequires: zlib-devel +BuildRequires: expat-devel +BuildRequires: proj-devel >= 6.2.0 +BuildRequires: tcl-devel +BuildRequires: libtirpc-devel %description OGDI is the Open Geographic Datastore Interface. OGDI is an @@ -37,36 +32,36 @@ data products/formats. %package devel -Summary: OGDI header files and documentation -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: zlib-devel expat-devel proj-devel +Summary: OGDI header files and documentation +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: zlib-devel expat-devel proj-devel >= 6.2.0 %description devel OGDI header files and developer's documentation. %package odbc -Summary: ODBC driver for OGDI -Requires: %{name} = %{version}-%{release} +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} +Summary: TCL wrapper for OGDI +Requires: %{name} = %{version}-%{release} %description tcl TCL wrapper for OGDI. %prep -%autosetup -p1 -n %{name}-%{gittag} +%autosetup -p1 -n %{name}-%{name}_%{gittag} # include documentation -cp -p %{SOURCE1} . +%{__cp} -p %{SOURCE1} . %build @@ -78,46 +73,45 @@ export CFG=debug # for -g # ogdits-3.1 test suite produces same result with and without the flag export CFLAGS="$RPM_OPT_FLAGS -DDONT_TD_VOID -DUSE_TERMIO" %configure \ - --with-binconfigs \ - --with-expat \ - --with-proj \ - --with-zlib + --with-binconfigs \ + --with-expat \ + --with-proj \ + --with-zlib # WARNING !!! # using %{?_smp_mflags} may break build -make +%{__make} # build tcl interface -make -C ogdi/tcl_interface \ - TCL_LINKLIB="-ltcl" +%{__make} -C ogdi/tcl_interface \ + TCL_LINKLIB="-ltcl" # build contributions -make -C contrib/gdal +%{__make} -C contrib/gdal # build odbc drivers -make -C ogdi/attr_driver/odbc \ - ODBC_LINKLIB="-lodbc" - +%{__make} -C ogdi/attr_driver/odbc \ + ODBC_LINKLIB="-lodbc" %install # export env TOPDIR=`pwd`; TARGET=Linux; export TOPDIR TARGET -make install \ - INST_INCLUDE=%{buildroot}%{_includedir}/%{name} \ - INST_LIB=%{buildroot}%{_libdir} \ - INST_BIN=%{buildroot}%{_bindir} +%{__make} install \ + INST_INCLUDE=%{buildroot}%{_includedir}/%{name} \ + INST_LIB=%{buildroot}%{_libdir} \ + INST_BIN=%{buildroot}%{_bindir} # install plugins olso -make install -C ogdi/tcl_interface \ - INST_LIB=%{buildroot}%{_libdir} -make install -C contrib/gdal \ - INST_LIB=%{buildroot}%{_libdir} -make install -C ogdi/attr_driver/odbc \ - INST_LIB=%{buildroot}%{_libdir} +%{__make} install -C ogdi/tcl_interface \ + 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? +%{__rm} %{buildroot}%{_bindir}/example? # we have multilib ogdi-config %if "%{_lib}" == "lib" @@ -130,9 +124,9 @@ rm %{buildroot}%{_bindir}/example? touch -r ogdi-config.in ogdi-config # install pkgconfig file and ogdi-config -mkdir -p %{buildroot}%{_libdir}/pkgconfig -install -p -m 644 ogdi.pc %{buildroot}%{_libdir}/pkgconfig/ -install -p -m 755 ogdi-config %{buildroot}%{_bindir}/ogdi-config-%{cpuarch} +%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig +%{__install} -p -m 644 ogdi.pc %{buildroot}%{_libdir}/pkgconfig/ +%{__install} -p -m 755 ogdi-config %{buildroot}%{_bindir}/ogdi-config-%{cpuarch} # ogdi-config wrapper for multiarch cat > %{buildroot}%{_bindir}/%{name}-config < - 3.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Feb 04 2019 Devrim Gündüs - 3.2.1-4 -- Rebuild for new GeOS and Proj - -* Fri Feb 01 2019 Fedora Release Engineering - 3.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Apr 04 2018 Dan Horák - 3.2.1-1 -- rebased to 3.2.1 -- refreshed RPC patches from upstream (related #1556614) - -* Thu Mar 29 2018 Dan Horák - 3.2.0-7 -- drop the -D_FORTIFY_SOURCE removal from preprocessor flags (#1560546) - -* Tue Mar 27 2018 Dan Horák - 3.2.0-6 -- fix incomplete compiler/linked flag injection (#1560546) - -* Thu Mar 15 2018 Dan Horák - 3.2.0-5 -- adapt to https://fedoraproject.org/wiki/Changes/SunRPCRemoval (#1556614) - -* Thu Feb 08 2018 Fedora Release Engineering - 3.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Jul 17 2017 Dan Horák - 3.2.0-1 -- updated to 3.2.0 final -- additional fix for #1470896 - -* Sat Feb 11 2017 Fedora Release Engineering - 3.2.0-0.28.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Devrim Gündüz - 3.2.0-0.27.beta2 -- Rebuilt against Proj 4.9.3. - -* Thu Feb 04 2016 Fedora Release Engineering - 3.2.0-0.26.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 3.2.0-0.25.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 12 2015 Devrim Gündüz - 3.2.0-0.24.beta2 -- Rebuilt for Proj 4.9.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-0.23.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-0.22.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 21 2014 Jaroslav Škarvada - 3.2.0-0.21.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 - -* Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-0.20.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 3.2.0-0.19.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Aug 19 2012 Tom Callaway - 3.2.0-0.18.beta2 -- fix ftbfs - -* Fri Jul 20 2012 Fedora Release Engineering - 3.2.0-0.17.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 3.2.0-0.16.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 3.2.0-0.15.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jul 25 2009 Fedora Release Engineering - 3.2.0-0.14.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 3.2.0-0.13.beta2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed May 28 2008 Balint Cristian - 3.2.0-0.12.beta2 -- fix for RHEL4 and RHEL5 - -* Wed May 28 2008 Balint Cristian - 3.2.0-0.11.beta2 -- fix a spourios permission - -* Wed May 28 2008 Balint Cristian - 3.2.0-0.10.beta2 -- new bugfix upstream -- drop all patches, upstream now - -* Mon May 26 2008 Balint Cristian - 3.2.0-0.9.beta1 -- fix debuginfo bz#329921 - -* Tue Feb 19 2008 Fedora Release Engineering - 3.2.0-0.8.beta1 -- Autorebuild for GCC 4.3 - -* Wed Jan 9 2008 Balint Cristian - 3.2.0-0.7.beta1 -- fix multilib issue for ogdi-config - -* Thu Jan 3 2008 Alex Lancaster - 3.2.0-0.6.beta1 -- Rebuild for new Tcl 8.5 - -* Thu Mar 01 2007 Balint Cristian 3.2.0-0.5.beta1 -- fix fc-6 tag upstream fedora-extras - -* Thu Mar 01 2007 Balint Cristian 3.2.0-0.4.beta1 -- disable only the hurting flag - -* Thu Mar 01 2007 Balint Cristian 3.2.0-0.3.beta1 -- disable fedora specific compile flags to avoid internal bugs - -* Sat Feb 24 2007 Balint Cristian 3.2.0-0.2.beta1 -- rename the release for correct fedora n-v-r -- fix -devel requires - -* Sat Feb 24 2007 Balint Cristian 3.2.0.beta1-1 -- new upstream release. - -* Tue Feb 13 2007 Balint Cristian 3.1.6-5 -- matrix.c is Public Domain. - -* Tue Feb 13 2007 Balint Cristian 3.1.6-4 -- add diff to latest CVS. -- solve matrix algebra license issue from CVS. - -* Tue Feb 13 2007 Balint Cristian 3.1.6-3 -- _dont_ duplicate any docs, so leave odbc and tcl without. - -* Tue Feb 13 2007 Balint Cristian 3.1.6-2 -- fix timestamps of source file. -- no need to duplicate the documentation -- fix post install script -- fix odbc lib innclusion - -* Mon Feb 12 2007 Balint Cristian 3.1.6-1 -- new upstream version. -- drop all patches, now they are upstream. -- remove useless source code cleanup from spec. -- pkgconfig is now autogenerated. - -* Mon Feb 12 2007 Balint Cristian 3.1.5-8 -- get rid of autoconf, useless. -- fix cp usage in specs. - -* Mon Feb 12 2007 Balint Cristian 3.1.5-7 -- include soname proposal patch -- cleanup more in specs - -* Sun Feb 11 2007 Balint Cristian 3.1.5-6 -- massive cleanup in sources. -- use -DUSE_TERMIO flag for linux. -- fix dlopen path. - -* Sat Feb 10 2007 Balint Cristian 3.1.5-5 -- more minor nits in spec -- pack the examples in devel -- drop tdvoid patch use CFLAGS instead -- patch instead use sed in spec (will try merge mainstream) -- fill requires for pkgconf file - -* Sat Feb 10 2007 Balint Cristian 3.1.5-4 -- preserves for external doc. - -* Fri Feb 09 2007 Balint Cristian 3.1.5-3 -- add dlopen path for lib64 too. -- add more docs -- fix export of CFLAGS -- move include files and add pkgconf module - -* Fri Feb 09 2007 Balint Cristian 3.1.5-2 -- add -soname versioning on shared libs -- remove polish lang from spec -- fix packing of libs -- tcl is plugin dont separate package name - -* Thu Feb 08 2007 Balint Cristian 3.1.5-1 -- first build for fedora extras -- require -fPIC, at least on x86_64 -- odbc compile fix use DONT_TD_VOID +* Tue Sep 3 2019 Devrim Gündüs - 4.1.0-1 +- Initial packaging for EPEL 8 +- Update to 4.1.0 diff --git a/sources b/sources index b6c6f73..f2a1db8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ogdi.pdf) = cfa693cee3eb43499fac5ef3771b47bd2ca617f48ad5f34e8461e63d19b41e54382916f980892d7afaec9deee4b28d0ef6383214c33f88ec7daaf80afd740aca -SHA512 (ogdi-3.2.1.tar.gz) = 74bb62dc437e83ec1364046621c66bcab9bd7c2e0f9bd62d8e5110b5f0adcc8519f76baefb2263aebdaa5fb76ec75c3075624559ce140b936f888bca5fa24a0a +SHA512 (ogdi_4_1_0.tar.gz) = b5e0f5a537baf400a5a36c65fa5b18234a5993332ee8d0ee519c583ec4fc2442efff20188d67596c9a019518197982e50c32427911b27d85df34c0187ed9849b