Accepting request 247561 from home:jengelh:branches:devel:libraries:c_c++
- Remove libservicelog-lib_version.patch, there is no reason provided to have it in the first place. - Remove libservicelog-pkgconfig.patch; there is nothing wrong with -L${libdir} in .pc files. OBS-URL: https://build.opensuse.org/request/show/247561 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libservicelog?expand=0&rev=29
This commit is contained in:
parent
98ed964b71
commit
12e746ecd5
@ -1,6 +1,6 @@
|
||||
libservicelog-1_0-1
|
||||
libservicelog-1_1-1
|
||||
obsoletes "libservicelog-<targettype> <= <version>"
|
||||
provides "libservicelog-<targettype> = <version>"
|
||||
libservicelog-devel
|
||||
requires -libservicelog-<targettype>
|
||||
requires "libservicelog-1_0-1-<targettype> = <version>"
|
||||
requires "libservicelog-1_1-1-<targettype> = <version>"
|
||||
|
@ -1,14 +0,0 @@
|
||||
Index: libservicelog-1.1.15/Makefile.am
|
||||
===================================================================
|
||||
--- libservicelog-1.1.15.orig/Makefile.am
|
||||
+++ libservicelog-1.1.15/Makefile.am
|
||||
@@ -41,8 +41,7 @@ AM_YFLAGS = -d -p v29nfy_
|
||||
# -P for the code prefixes, -o because autoconf wants the standard file name
|
||||
AM_LFLAGS = -Pv29nfy_ -olex.yy.c
|
||||
|
||||
-libservicelog_la_LDFLAGS = -module -version-info \
|
||||
- @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@
|
||||
+libservicelog_la_LDFLAGS = -version-info @GENERIC_API_VERSION@
|
||||
|
||||
LIBTOOL_DEPS = @LIBTOOL_DEPS@
|
||||
libtool: $(LIBTOOL_DEPS)
|
@ -1,32 +0,0 @@
|
||||
Index: libservicelog-1.1.15/configure.ac
|
||||
===================================================================
|
||||
--- libservicelog-1.1.15.orig/configure.ac
|
||||
+++ libservicelog-1.1.15/configure.ac
|
||||
@@ -81,5 +81,15 @@ AC_FUNC_STAT
|
||||
AC_FUNC_STRFTIME
|
||||
AC_CHECK_FUNCS([memset strerror strtoull uname])
|
||||
|
||||
+AC_MSG_CHECKING([Whether to put -L\${libdir} in .pc])
|
||||
+if test -z "$(echo $libdir|fgrep /usr)"; then
|
||||
+ LIBS_LIBDIR='-L${libdir}'
|
||||
+ use_libdir=yes
|
||||
+else
|
||||
+ use_libdir=no
|
||||
+fi
|
||||
+AC_MSG_RESULT(${use_libdir})
|
||||
+AC_SUBST(LIBS_LIBDIR)
|
||||
+
|
||||
AC_CONFIG_FILES([Makefile libservicelog.spec src/servicelog-1.pc])
|
||||
AC_OUTPUT
|
||||
Index: libservicelog-1.1.15/src/servicelog-1.pc.in
|
||||
===================================================================
|
||||
--- libservicelog-1.1.15.orig/src/servicelog-1.pc.in
|
||||
+++ libservicelog-1.1.15/src/servicelog-1.pc.in
|
||||
@@ -6,5 +6,5 @@ includedir=@includedir@
|
||||
Name: servicelog
|
||||
Description: Library for access to the system servicelog
|
||||
Version: @VERSION@
|
||||
-Libs: -L${libdir} -lsqlite3 -l@GENERIC_PACKAGE_NAME@
|
||||
-Cflags: -I${includedir}/@GENERIC_PACKAGE_NAME@-@GENERIC_API_VERSION@
|
||||
+Libs: @LIBS_LIBDIR@ -lsqlite3 -l@GENERIC_PACKAGE_NAME@
|
||||
+Cflags: -I${includedir}/servicelog-@GENERIC_API_VERSION@
|
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 4 13:26:49 UTC 2014 - jengelh@inai.de
|
||||
|
||||
- baselibs.conf did not match with the shared library package
|
||||
- Remove libservicelog-lib_version.patch, there is no reason
|
||||
provided to have it in the first place.
|
||||
- Remove libservicelog-pkgconfig.patch; there is nothing wrong
|
||||
with -L${libdir} in .pc files.
|
||||
- Remove dlopen hacks; the packages ppc64-diag and servicelog which
|
||||
OBS lists as dependants use no visible call to dlopen but do
|
||||
a compile-time link.
|
||||
- As the public header servicelog.h #includes <sqlite3.h>,
|
||||
Reqiures: sqlite3-devel is needed for libservicelog-devel.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 4 12:56:42 UTC 2014 - jloeser@suse.com
|
||||
|
||||
|
@ -16,15 +16,22 @@
|
||||
#
|
||||
|
||||
|
||||
%define so_version 1
|
||||
|
||||
Name: libservicelog
|
||||
%define lname libservicelog-1_1-1
|
||||
Version: 1.1.15
|
||||
Release: 0
|
||||
Summary: Servicelog Database and Library
|
||||
License: LGPL-2.0+
|
||||
Group: System/Libraries
|
||||
Requires: libservicelog-library
|
||||
Url: http://linux-diag.sourceforge.net/servicelog/
|
||||
|
||||
#Git-Clone: git://git.code.sf.net/p/linux-diag/libservicelog
|
||||
#Git-Web: http://sourceforge.net/p/linux-diag/libservicelog/
|
||||
Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Source2: libservicelog-rpmlintrc
|
||||
PreReq: %{_sbindir}/groupadd
|
||||
Patch2: libservicelog-printf_types.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: librtas-devel
|
||||
@ -32,15 +39,7 @@ BuildRequires: libtool
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Url: http://linux-diag.sourceforge.net/servicelog/
|
||||
ExclusiveArch: ppc ppc64 ppc64le
|
||||
Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Source2: libservicelog-rpmlintrc
|
||||
PreReq: %{_sbindir}/groupadd
|
||||
Patch0: libservicelog-pkgconfig.patch
|
||||
Patch1: libservicelog-lib_version.patch
|
||||
Patch2: libservicelog-printf_types.patch
|
||||
|
||||
%description
|
||||
The libservicelog package contains a library to create and maintain a
|
||||
@ -49,13 +48,12 @@ allows for the logging of serviceable and informational events, and for
|
||||
the logging of service procedures that have been performed upon the
|
||||
system.
|
||||
|
||||
|
||||
%package -n %{name}%{so_version}
|
||||
%package -n %lname
|
||||
Summary: Servicelog Database and Library
|
||||
Group: System/Libraries
|
||||
Provides: libservicelog-library
|
||||
Requires: %name
|
||||
|
||||
%description -n %{name}%{so_version}
|
||||
%description -n %lname
|
||||
The libservicelog package contains a library to create and maintain a
|
||||
database for storing events related to system service. This database
|
||||
allows for the logging of serviceable and informational events, and for
|
||||
@ -65,17 +63,15 @@ system.
|
||||
%package devel
|
||||
Summary: Development files for libservicelog
|
||||
Group: Development/Libraries/Other
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name}%{so_version} = %{version}
|
||||
Requires: %lname = %version
|
||||
Requires: glibc-devel
|
||||
Requires: sqlite3-devel
|
||||
|
||||
%description devel
|
||||
Contains header files for building with libservicelog.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
@ -84,15 +80,14 @@ autoreconf -fiv
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%{makeinstall}
|
||||
%make_install
|
||||
%__rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%pre
|
||||
/usr/sbin/groupadd -r service || echo groupadd service failed
|
||||
|
||||
%post -n %{name}%{so_version} -p /sbin/ldconfig
|
||||
|
||||
%postun -n %{name}%{so_version} -p /sbin/ldconfig
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
%postun -n %lname -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
@ -100,15 +95,14 @@ make %{?_smp_mflags}
|
||||
%attr( 754, root, service ) %dir /var/lib/servicelog
|
||||
%attr( 644, root, service ) /var/lib/servicelog/servicelog.db
|
||||
|
||||
%files -n %{name}%{so_version}
|
||||
%files -n %lname
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/lib*.so.*
|
||||
# dlopen object
|
||||
%{_libdir}/*.so
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/servicelog-1
|
||||
%{_libdir}/pkgconfig/servicelog-1.pc
|
||||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user