rpms/mariadb-connector-c
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Minor corrections, because scratch build failed.

Browse Source 
Moved comments, typos, etc.
Changelog remained the same.
This commit is contained in:
Michal Schorm 2016-11-03 10:24:15 +01:00
parent 0fb9789ffe
commit e5dd63c669
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mariadb-connector-c.spec
View File

@ -33,7 +33,7 @@ Development files for mariadb-connector-c.
-DWITH_EXTERNAL_ZLIB=ON\ -DWITH_EXTERNAL_ZLIB=ON\
-DPREFIX_INSTALL_DIR="/"\ -DPREFIX_INSTALL_DIR="/"\
-DCMAKE_SYSTEM_PROCESSOR="%{_arch}"\ -DCMAKE_SYSTEM_PROCESSOR="%{_arch}"\
-DPLUGIN_INSTALL_DIR="%{_libdir}/plugin" # TODO: move plugin dir from libdir/plugin/ to libdir/mariadb/plugin -DPLUGIN_INSTALL_DIR="%{_libdir}/plugin" # TODO: move plugin dir from libdir/plugin/ to libdir/mariadb/plugin
make %{?_smp_mflags} make %{?_smp_mflags}
@ -43,13 +43,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/mariadb" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf 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/libmariadbclient.a # static linked libraries
rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient.a rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient.a
rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient_r.a rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient_r.a
# #
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 /$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 -r /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeFiles
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/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/Makefile
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeLists.txt rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeLists.txt
rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/my_config.h.in rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/my_config.h.in
@ -65,14 +65,18 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
%{_libdir}/plugin/dialog.so %{_libdir}/plugin/dialog.so
%{_libdir}/plugin/mysql_clear_password.so %{_libdir}/plugin/mysql_clear_password.so
%{_libdir}/mariadb %{_libdir}/mariadb
%{_sysconfdir}/ld.so.conf.d # fix of RPATH. If there is a set config file, libdir/mariadb/ is added to search for libraries # 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 %files devel
%{_bindir}/maridb_config # program which provides info for compiling programs with this library # program which provides info for compiling programs with this library
%{_bindir}/mariadb_config
# symlinks to the .so lib
%{_libdir}/mariadb/libmariadb.so %{_libdir}/mariadb/libmariadb.so
%{_libdir}/mariadb/libmysqlclient_r.so %{_libdir}/mariadb/libmysqlclient_r.so
%{_libdir}/mariadb/libmysqlclient.so %{_libdir}/mariadb/libmysqlclient.so
%{_includedir}/mariadb # header files # header files
%{_includedir}/mariadb
@ -82,7 +86,7 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
- Fixed ownership of {_sysconfigdir}/ld.so.conf.d (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 redundnace on lines with {_sysconfigdir}/ld.so.conf.d
- Fixed ownership of {_bindir} (only one program is owned, so let's be accurate) - Fixed ownership of {_bindir} (only one program is owned, so let's be accurate)
- Some comments added, for me and futura maintainers - Some comments added, for me and future maintainers
* Mon Oct 17 2016 Michal Schorm <mschorm@redhat.com> - 2.3.1-2 * Mon Oct 17 2016 Michal Schorm <mschorm@redhat.com> - 2.3.1-2
- Fixed ownership of {_libdir}/mariadb directory and cosmetic specfile changes - Fixed ownership of {_libdir}/mariadb directory and cosmetic specfile changes