pool/libservicelog
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 247633 from devel:libraries:c_c++

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/247633
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libservicelog?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2014-09-10 15:02:13 +00:00 committed by Git OBS Bridge
commit e5d1975a63
7 changed files with 52 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@ -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>"

3
libservicelog-1.1.14.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0c750363efc4279fad14f5b3d344689ea369ab639382a9c7bd47000b5e60287
size 392906

3
libservicelog-1.1.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:981c85cef132153fde7da0635fd65f487d1f90adf0e929cef54b5ecc9d43230d
size 392259

17
libservicelog-lib_version.patch
View File

@ -1,17 +0,0 @@
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -33,8 +33,10 @@ AM_LFLAGS = -Pv29nfy_ -olex.yy.c
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = servicelog-1.pc
-libservicelog_la_LDFLAGS = -module -version-info \
- @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@
+#libservicelog_la_LDFLAGS = -module -version-info \
+# @GENERIC_API_VERSION@ -release @GENERIC_RELEASE@
+
+libservicelog_la_LDFLAGS = -version-info @GENERIC_API_VERSION@
AM_CFLAGS = -Wall -g -DDEST_DIR='"${exec_prefix}"'
AM_LDFLAGS = -lsqlite3 -lrtas -lrtasevent

28
libservicelog-pkgconfig.patch
View File

@ -1,28 +0,0 @@
--- src/servicelog-1.pc.in.orig 2011-11-02 12:51:24.000000000 +0100
+++ src/servicelog-1.pc.in 2011-11-02 12:52:56.000000000 +0100
@@ -6,5 +6,5 @@
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@
--- configure.ac.orig 2011-11-02 12:54:39.000000000 +0100
+++ configure.ac 2011-11-02 12:56:44.000000000 +0100
@@ -74,5 +74,15 @@
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 src/Makefile libservicelog.spec src/servicelog-1.pc])
AC_OUTPUT

23
libservicelog.changes
View File

@ -1,4 +1,27 @@
-------------------------------------------------------------------
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
- version update to 1.1.15 (BNC#894856)
- Cleanup build tools (configure.ac and Makefile.am)
- modified patches:
* libservicelog-lib_version.patch
* libservicelog-pkgconfig.patch
-------------------------------------------------------------------
Fri Jan 17 10:31:57 UTC 2014 - jloeser@suse.com
- version update to 1.1.14 (FATE#315456)

54
libservicelog.spec
View File

@ -16,15 +16,22 @@
#
%define so_version 1
Name: libservicelog
Version: 1.1.14
%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,32 +39,23 @@ 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
database for storing events related to system service. This database
database for storing events related to system service. This database
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
database for storing events related to system service. This database
allows for the logging of serviceable and informational events, and for
the logging of service procedures that have been performed upon the
system.
@ -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
%patch1
%patch2 -p1
%build
@ -84,31 +80,29 @@ 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,-)
%doc COPYING NEWS AUTHORS
%doc COPYING AUTHORS
%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