Fixed ownership of {_libdir}/mariadb (this dir must me owned by package)
Fixed ownership of {_sysconfigdir}/ld.so.conf.d (this dir must me owned by package) Fixed redundnace on lines with {_sysconfigdir}/ld.so.conf.d Fixed ownership of {_bindir} (only one program is owned, so let's be accurate) Some comments added, for me and future maintainers
This commit is contained in:
parent
fb552434a9
commit
522efce550
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
/mariadb_client-2.0.0-src.tar.gz
|
||||
/mariadb-connector-c-2.1.0-src.tar.gz
|
||||
/mariadb-connector-c-2.3.1-src.tar.gz
|
||||
|
@ -1,11 +1,10 @@
|
||||
Summary: The MariaDB Native Client library (C driver)
|
||||
Name: mariadb-connector-c
|
||||
Version: 2.1.0
|
||||
Release: 2%{?dist}
|
||||
|
||||
License: LGPLv2+
|
||||
Version: 2.3.1
|
||||
Release: 3%{?dist}
|
||||
Summary: The MariaDB Native Client library (C driver)
|
||||
Group: Applications/Databases
|
||||
Source: https://downloads.mariadb.org/f/connector-c-2.1.0/source-tgz/mariadb-connector-c-%{version}-src.tar.gz
|
||||
License: LGPLv2+
|
||||
Source: http://mirror.hosting90.cz/mariadb//connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
|
||||
Url: https://mariadb.org/en/
|
||||
BuildRequires: zlib-devel cmake openssl-devel
|
||||
|
||||
@ -16,12 +15,14 @@ developed in C/C++ to MariaDB and MySQL databases.
|
||||
%package devel
|
||||
Summary: Development files for mariadb-connector-c.
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: xmlto
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Development files for mariadb-connector-c.
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n mariadb-connector-c-%{version}-src
|
||||
|
||||
@ -32,41 +33,67 @@ Development files for mariadb-connector-c.
|
||||
-DWITH_EXTERNAL_ZLIB=ON\
|
||||
-DPREFIX_INSTALL_DIR="/"\
|
||||
-DCMAKE_SYSTEM_PROCESSOR="%{_arch}"\
|
||||
-DPLUGIN_INSTALL_DIR="%{_libdir}/plugin"
|
||||
-DPLUGIN_INSTALL_DIR="%{_libdir}/plugin" # TODO: move plugin dir from libdir/plugin/ to libdir/mariadb/plugin
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmariadbclient.a
|
||||
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
|
||||
echo "%{_libdir}/mariadb" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
|
||||
rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmariadbclient.a # static linked libraries
|
||||
rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient.a
|
||||
rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient_r.a
|
||||
#
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile.am
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile.am # Makefile.am is a programmer-defined file and is used by automake to generate the Makefile.in
|
||||
rm -r /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeFiles
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/mysql_version.h.in
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/mysql_version.h.in # *.in files are produced while creating final *.h files
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeLists.txt
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/my_config.h.in
|
||||
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/mariadb/libmariadb.so.2
|
||||
%{_libdir}/plugin/dialog.so
|
||||
%{_libdir}/plugin/mysql_clear_password.so
|
||||
%{_libdir}/mariadb
|
||||
# fix of RPATH. If there is a set config file, libdir/mariadb/ is added to search for libraries
|
||||
%{_sysconfdir}/ld.so.conf.d
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/*
|
||||
# program which provides info for compiling programs with this library
|
||||
%{_bindir}/mariadb_config
|
||||
# symlinks to the .so lib
|
||||
%{_libdir}/mariadb/libmariadb.so
|
||||
%{_libdir}/mariadb/libmysqlclient_r.so
|
||||
%{_libdir}/mariadb/libmysqlclient.so
|
||||
%{_libdir}/mariadb/libmysql.so
|
||||
# header files
|
||||
%{_includedir}/mariadb
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Oct 27 2016 Michal Schorm <mschorm@redhat.com> - 2.3.1-3
|
||||
- Fixed ownership of {_libdir}/mariadb (this dir must me owned by package)
|
||||
- Fixed ownership of {_sysconfigdir}/ld.so.conf.d (this dir must me owned by package)
|
||||
- Fixed redundnace on lines with {_sysconfigdir}/ld.so.conf.d
|
||||
- Fixed ownership of {_bindir} (only one program is owned, so let's be accurate)
|
||||
- Some comments added, for me and future maintainers
|
||||
|
||||
* Mon Oct 17 2016 Michal Schorm <mschorm@redhat.com> - 2.3.1-2
|
||||
- Fixed ownership of {_libdir}/mariadb directory and cosmetic specfile changes
|
||||
|
||||
* Tue Sep 13 2016 Michal Schorm <mschorm@redhat.com> - 2.3.1-1
|
||||
- Rebase to version 2.3.1
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
@ -81,4 +108,3 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
|
||||
|
||||
* Tue Aug 26 2014 Matej Mužila <mmuzila@redhat.com> - 2.0.0-2
|
||||
- Initial version for 2.0.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user