Browse Source

updated 3 packages

mariadb-connector-odbc-3.1.11-3

netatalk-3.1.12-3

unixODBC-2.3.9-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
8bf63d59ef

+ 209 - 0
m/mariadb-connector-odbc/mariadb-connector-odbc-vl.spec

@@ -0,0 +1,209 @@
+# For deep debugging we need to build binaries with extra debug info
+%bcond_with     debug
+
+# Disable CMake in-source builds
+#   This is a fix for the https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
+#   So the beaviour will be the same also in F31 nad F32
+%undefine __cmake_in_source_build
+
+
+
+Name:           mariadb-connector-odbc
+Version:        3.1.11
+Release:        3%{?with_debug:.debug}%{?_dist_release}
+Summary:        The MariaDB Native Client library (ODBC driver)
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2+
+# Online documentation can be found at: https://mariadb.com/kb/en/library/mariadb-connector-odbc/
+URL:            https://mariadb.org/en/
+Source:         https://downloads.mariadb.org/f/connector-odbc-%{version}/%{name}-%{version}-ga-src.tar.gz
+Patch1:         libraries_include_path.patch
+
+BuildRequires:  cmake unixODBC-devel gcc-c++
+BuildRequires:  libmariadb-devel >= 3.0.6
+Obsoletes:      mysql-connector-odbc < 8.0.0
+Provides:       mysql-connector-odbc = 8.0.0
+
+%description
+MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using
+the industry standard Open Database Connectivity (ODBC) API. It supports ODBC
+Standard 3.5, can be used as a drop-in replacement for MySQL Connector/ODBC,
+and it supports both Unicode and ANSI modes.
+
+
+%debug_package
+
+
+%prep
+%setup -q -n %{name}-%{version}-ga-src
+%patch1 -p1
+
+
+%build
+%cmake . \
+       -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \
+       -DMARIADB_LINK_DYNAMIC="%{_libdir}/libmariadb.so" \
+\
+       -DINSTALL_LAYOUT=RPM \
+       -DINSTALL_LIBDIR="%{_lib}" \
+       -DINSTALL_LIB_SUFFIX="%{_lib}" \
+       -DINSTALL_DOCDIR="%{_defaultdocdir}/%{name}" \
+       -DINSTALL_LICENSEDIR="%{_defaultlicensedir}/%{name}"
+
+# Override all optimization flags when making a debug build
+%if %{with debug}
+CFLAGS="$CFLAGS     -O0 -g"; export CFLAGS
+CXXFLAGS="$CXXFLAGS -O0 -g"; export CXXFLAGS
+FFLAGS="$FFLAGS     -O0 -g"; export FFLAGS
+FCFLAGS="$FCFLAGS   -O0 -g"; export FCFLAGS
+%endif
+
+#cmake -B %_vpath_builddir -LAH
+%cmake_build
+
+
+%install
+%cmake_install
+rm -rf %{buildroot}%{_defaultdocdir}/%{name}
+rm -rf %{buildroot}%{_defaultlicensedir}/%{name}
+
+
+%files
+%license COPYING
+%doc     README
+# This is unixODBC plugin. It resides directly in %%{_libdir} to be consistent with the rest of unixODBC plugins. Since it is plugin, it doesn´t need to be versioned.
+%{_libdir}/libmaodbc.so
+
+
+%changelog
+* Sat Mar 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.11-3
+- initial build for Vine Linux.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 14 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.11-1
+- Rebase to 3.1.11
+- Add updates for paths in libraries_include_path.patch
+
+* Thu Aug 06 2020 Michal Schorm <mschorm@redhat.com> - 3.1.9-4
+- Force the CMake change regarding the in-source builds also to F31 and F32
+- %%cmake macro covers the %%{set_build_flags}, so they are not needed
+  That also means, the debug build changes to the build flags must be done AFTER the
+  %%cmake macro was used.
+- %%cmake macro also covers several other options which redudndant specification I removed in this commit
+- Default to %%cmake commands instead of %%make commands
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 02 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.9-1
+- Rebase to 3.1.9
+- Add patch add_docs_license_dir_option
+
+* Thu Apr 09 2020 Michal Schorm <mschorm@redhat.com> - 3.1.7-1
+- Rebase to 3.1.7
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 23 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.6-1
+- Rebase to 3.1.6
+
+* Fri Nov 15 2019 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.5-1
+- Rebase to 3.1.5
+
+* Tue Nov 12 2019 Michal Schorm <mschorm@redhat.com> - 3.1.4-2
+- Rebuild on top of new mariadb-connector-c
+
+* Mon Nov 04 2019 Michal Schorm <mschorm@redhat.com> - 3.1.4-1
+- Rebase to 3.1.4
+
+* Mon Aug 19 2019 Michal Schorm <mschorm@redhat.com> - 3.1.3-1
+- Rebase to 3.1.3
+
+* Wed Jul 31 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-1
+- Rebase to 3.1.2
+- Patch2 upstreamed
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-4
+- Use macro for setting the compiler flags
+
+* Wed Jun 05 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-3
+- Added debug build switch
+- Added patch2: configurable doc and license dirs paths
+
+* Wed Jun 05 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-2
+- Patch solution found
+
+* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-1
+- Rebase to 3.1.1
+
+* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3.0.9-1
+- Rebase to 3.0.9
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 23 2019 Björn Esser <besser82@fedoraproject.org> - 3.0.8-2
+- Append curdir to CMake invokation. (#1668512)
+
+* Sun Jan 06 2019 Michal Schorm <mschorm@redhat.com> - 3.0.8-1
+- Rebase to 3.0.8
+
+* Tue Nov 20 2018 Michal Schorm <mschorm@redhat.com> - 3.0.7-1
+- Rebase to 3.0.7
+
+* Fri Aug 03 2018 Michal Schorm <mschorm@redhat.com> - 3.0.6-1
+- Rebase to 3.0.6
+- Raise the minimal version of the connector-c required, because of a fixed bug
+  which affected connector-odbc builds
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Feb 10 2018 Michal Schorm <mschorm@redhat.com> - 3.0.3-1
+- Rebase to 3.0.3 version
+- Use more macros
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 30 2018 Michal Schorm <mschorm@redhat.com> - 3.0.2-1
+- Rebase to 3.0.2 version
+- Update ldconfig scriptlets
+- Remove Group tag
+
+* Thu Sep 07 2017 Augusto Caringi <acaringi@fedoraproject.org> - 3.0.1-2
+- Update to top of 3.0 branch from GitHub 860e7f8b754f (version supporting dynamic linking)
+- Source tarball composed from upstream GitHub, because the latest version solves the issues
+  with dynamic linking.
+
+* Mon Sep 04 2017 Augusto Caringi <acaringi@fedoraproject.org> - 3.0.1-1
+- Update to version 3.0.1
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue May 16 2017 Michal Schorm <mschorm@redhat.com> - 2.0.14-1
+- Update to version 2.0.14 and check, if blockers still apply. They do.
+- Upstream issue created
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Oct 19 2016 Michal Schorm <mschorm@redhat.com> - 2.0.12-1
+- Initial version for 2.0.12

+ 16 - 17
n/netatalk/netatalk-vl.spec

@@ -6,8 +6,8 @@ Summary:        AFP fileserver for Macintosh clients
 Summary(ja):    Macintoshクライアント向けのAFPファイルサーバー
 Summary(ja):    Macintoshクライアント向けのAFPファイルサーバー
 Name:           netatalk
 Name:           netatalk
 Version:        3.1.12
 Version:        3.1.12
-Release:        2%{_dist_release}%{?with_systemd:.systemd}
-Group:          System Environment/Daemons
+Release:        3%{_dist_release}%{?with_systemd:.systemd}
+Group:          servers
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 Packager:       shaolin, tomop
 Packager:       shaolin, tomop
@@ -28,11 +28,10 @@ Patch4:         netatalk-invalid_dircache_entries.patch
 
 
 ############################################################## REQUIREMENTS
 ############################################################## REQUIREMENTS
 BuildRequires:  cracklib openssl-devel pam quota libtool automake
 BuildRequires:  cracklib openssl-devel pam quota libtool automake
-BuildRequires:  autoconf libdb-devel pam-devel tcp_wrappers libgcrypt-devel
+BuildRequires:  autoconf libdb-devel pam-devel libgcrypt-devel
 BuildRequires:  avahi-devel libacl-devel openldap-devel
 BuildRequires:  avahi-devel libacl-devel openldap-devel
-BuildRequires:  dbus-devel dbus-glib-devel glib2-devel systemtap-sdt-devel
-BuildRequires:  libevent-devel libtdb-devel libmysqlclient-devel
-BuildRequires:  python3-rpm-macros
+BuildRequires:  dbus-devel dbus-glib-devel glib2-devel
+BuildRequires:  libevent-devel libtdb-devel libmariadb-devel
 BuildRequires:  tracker-devel
 BuildRequires:  tracker-devel
 
 
 Requires:       dbus-python3
 Requires:       dbus-python3
@@ -62,15 +61,19 @@ Netatalkを実行している*NIX/*BSDシステムでは、多くのMacintoshク
 アントに対してAppleShareファイルサーバー(AFP)としてサービスを提供
 アントに対してAppleShareファイルサーバー(AFP)としてサービスを提供
 可能です。
 可能です。
 
 
+
 %package devel
 %package devel
-Group:         Development/Libraries
 Summary:       Headers for Netatalk development
 Summary:       Headers for Netatalk development
 Summary(ja):   Netatalk開発用ヘッダファイル
 Summary(ja):   Netatalk開発用ヘッダファイル
+Group:         programming
 
 
 %description devel
 %description devel
 This package contains the header files for Netatalk.
 This package contains the header files for Netatalk.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %autopatch -p1
 %autopatch -p1
@@ -88,15 +91,8 @@ find include \( -name '*.h' -a -executable \) -exec chmod -x {} \;
 # Don't call systemctl daemon-reload during the build
 # Don't call systemctl daemon-reload during the build
 sed -i 's\-systemctl daemon-reload\\g' distrib/initscripts/Makefile.in
 sed -i 's\-systemctl daemon-reload\\g' distrib/initscripts/Makefile.in
 
 
-%build
-
-%ifnarch x86_64
-export CFLAGS=$(echo '%{optflags}' -fPIE | sed -e 's|-O2|-O0|')
-%else
-export CFLAGS="%{optflags} -fPIE"
-%endif
-export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack"
 
 
+%build
 %configure \
 %configure \
         --disable-silent-rules \
         --disable-silent-rules \
         --disable-static \
         --disable-static \
@@ -178,7 +174,6 @@ fi
 %else
 %else
 /sbin/chkconfig --add netatalk
 /sbin/chkconfig --add netatalk
 %endif
 %endif
-/sbin/ldconfig
 
 
 %preun
 %preun
 %if %{with systemd}
 %if %{with systemd}
@@ -201,7 +196,6 @@ if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
     /sbin/service netatalk condrestart > /dev/null 2>&1 || :
     /sbin/service netatalk condrestart > /dev/null 2>&1 || :
 fi
 fi
 %endif
 %endif
-/sbin/ldconfig
 
 
 
 
 %files
 %files
@@ -242,7 +236,12 @@ fi
 %{_bindir}/netatalk-config
 %{_bindir}/netatalk-config
 %{_mandir}/man*/netatalk-config.1*
 %{_mandir}/man*/netatalk-config.1*
 
 
+
 %changelog
 %changelog
+* Sat Mar 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.12-3
+- rebuilt with current environment.
+- cleaned up BR.
+
 * Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.12-2
 * Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.12-2
 - rebuilt with libevent-2.1.11.
 - rebuilt with libevent-2.1.11.
 - added systemd support (disabled as default).
 - added systemd support (disabled as default).

+ 24 - 14
u/unixODBC/unixODBC-vl.spec

@@ -1,14 +1,15 @@
 Name: unixODBC
 Name: unixODBC
-Version: 2.3.7
-Release: 2%{?_dist_release}
+Version: 2.3.9
+Release: 1%{?_dist_release}
 Summary: A complete ODBC Driver Manager for Linux
 Summary: A complete ODBC Driver Manager for Linux
 Summary(ja): Linux 用 ODBC ドライバマネージャー
 Summary(ja): Linux 用 ODBC ドライバマネージャー
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
-Group: System Environment/Libraries
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
 License: GPLv2+ and LGPLv2+
 License: GPLv2+ and LGPLv2+
 URL: http://www.unixODBC.org/
 URL: http://www.unixODBC.org/
-
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
 Source1: odbcinst.ini
 Source1: odbcinst.ini
 Source4: conffile.h
 Source4: conffile.h
@@ -23,18 +24,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
 BuildRequires: readline-devel
 BuildRequires: readline-devel
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 Install unixODBC if you want to access databases through ODBC.
 Install unixODBC if you want to access databases through ODBC.
 You will also need the mysql-connector-odbc package if you want to access
 You will also need the mysql-connector-odbc package if you want to access
 a MySQL database, and/or the postgresql-odbc package for PostgreSQL.
 a MySQL database, and/or the postgresql-odbc package for PostgreSQL.
 
 
+
 %package devel
 %package devel
 Summary: Development files for programs which will use the unixODBC library.
 Summary: Development files for programs which will use the unixODBC library.
 Summary(ja): unixODBC ライブラリを用いるプログラムのための開発用ファイル
 Summary(ja): unixODBC ライブラリを用いるプログラムのための開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 
 %description devel
 %description devel
@@ -42,6 +41,10 @@ The unixODBC package can be used to access databases through ODBC
 drivers. If you want to develop programs that will access data through
 drivers. If you want to develop programs that will access data through
 ODBC, you need to install this package.
 ODBC, you need to install this package.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %patch8 -p1
 %patch8 -p1
@@ -54,6 +57,7 @@ chmod 0644 doc/ProgrammerManual/Tutorial/*.html
 chmod 0644 doc/lst/*
 chmod 0644 doc/lst/*
 chmod 0644 include/odbcinst.h
 chmod 0644 include/odbcinst.h
 
 
+
 %build
 %build
 autoreconf -ivf
 autoreconf -ivf
 
 
@@ -63,7 +67,7 @@ CXXFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS
 export CFLAGS CXXFLAGS
 
 
 %configure --with-gnu-ld=yes --enable-threads=yes \
 %configure --with-gnu-ld=yes --enable-threads=yes \
-        --enable-drivers=yes --enable-driverc=yes --enable-ltdllib
+        --enable-drivers=yes --enable-driverc=yes
 
 
 # Get rid of the rpaths
 # Get rid of the rpaths
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -71,6 +75,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 
 make all
 make all
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -116,22 +121,21 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > bas
 find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
 find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
 
 
 # move these to main package, they're often dlopened...
 # move these to main package, they're often dlopened...
-for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so
+for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so libtdsS.so
 do
 do
     echo "%{_libdir}/$lib" >> base-so-list
     echo "%{_libdir}/$lib" >> base-so-list
     grep -v "/$lib$" devel-so-list > devel-so-list.x
     grep -v "/$lib$" devel-so-list > devel-so-list.x
     mv -f devel-so-list.x devel-so-list
     mv -f devel-so-list.x devel-so-list
 done
 done
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 
 %files -f base-so-list
 %files -f base-so-list
-%doc README COPYING AUTHORS ChangeLog NEWS doc
+%license COPYING
+%doc README AUTHORS ChangeLog NEWS doc
 %doc README.dist
 %doc README.dist
 %config(noreplace) %{_sysconfdir}/odbc*
 %config(noreplace) %{_sysconfdir}/odbc*
 %{_bindir}/odbcinst
 %{_bindir}/odbcinst
@@ -146,7 +150,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 
 
+
 %changelog
 %changelog
+* Sat Mar 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.9-1
+- new upstream release.
+- dropped scriptlets.
+- updated odbcinst.ini.
+
 * Sat Aug 31 2019 Toshiaki Ara <ara_t@384.jp> 2.3.7-2
 * Sat Aug 31 2019 Toshiaki Ara <ara_t@384.jp> 2.3.7-2
 - rebuild with readline-8.0
 - rebuild with readline-8.0