[packages/libosso] - updated to 2.35 - updated opt patch

[qboosh]

commit 3342bf4f1a7f80c9a34f6f84e43e00e7f68b74be
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 2 21:22:18 2019 +0200

    - updated to 2.35
    - updated opt patch

 libosso-opt.patch | 34 ++++++++++------------------------
 libosso.spec      | 39 +++++++++++++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 32 deletions(-)
---
diff --git a/libosso.spec b/libosso.spec
index 654c093..d4ddbeb 100644
--- a/libosso.spec
+++ b/libosso.spec
@@ -1,21 +1,32 @@
+#
+# Condional build:
+%bcond_without	tests	# unit tests
+
 Summary:	OSSO Application Framework for Maemo
 Summary(pl.UTF-8):	Szkielet aplikacji OSSO dla Maemo
 Name:		libosso
-Version:	1.20
+Version:	2.35
 Release:	1
-License:	LGPL
+License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://repository.maemo.org/pool/bora/free/source/%{name}_%{version}-1.tar.gz
-# Source0-md5:	6bb3f309371d398d321e52c9e52ca605
+#Source0Download: https://github.com/maemo-leste/libosso/releases
+Source0:	https://github.com/maemo-leste/libosso/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	0c4c8313b824580777ed07d951c0ecbd
 Patch0:		%{name}-opt.patch
 URL:		http://maemo.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.22
+BuildRequires:	gcc >= 5:3.2
+BuildRequires:	dbus-devel
+BuildRequires:	dbus-glib-devel >= 0.61
 BuildRequires:	glib2-devel >= 1:2.4.0
 BuildRequires:	libtool
-BuildRequires:	outo >= 0.1.1
+BuildRequires:	mce-devel >= 1.5
+#BuildRequires:	osso-af-settings >= 0.8.6-3 just for dbus services dir detection
+%{?with_tests:BuildRequires:	outo >= 0.1.1}
 BuildRequires:	pkgconfig
+Requires:	dbus-glib >= 0.61
+Requires:	glib2 >= 1:2.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,7 +40,7 @@ Summary:	Header files for libosso
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libosso
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	dbus-glib-devel >= 0.22
+Requires:	dbus-glib-devel >= 0.61
 Requires:	glib2-devel >= 1:2.4.0
 
 %description devel
@@ -58,6 +69,7 @@ Statyczna biblioteka libosso.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make}
@@ -68,6 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with tests}
+# don't package them
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/outo
+%{__rm}	$RPM_BUILD_ROOT%{_datadir}/dbus-1/services/com.nokia.unit_test*.service
+%endif
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libosso.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dbus-launch.sh
 %attr(755,root,root) %{_bindir}/osso-date
 %attr(755,root,root) %{_libdir}/libosso.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libosso.so.1
 %{_sysconfdir}/dbus-1/system.d/libosso.conf
 %dir %{_sysconfdir}/libosso
 %{_sysconfdir}/libosso/sessionbus-libosso.conf
@@ -88,9 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libosso.so
-%{_libdir}/libosso.la
 %{_includedir}/libosso.h
 %{_includedir}/log-functions.h
+%{_includedir}/muali.h
+%{_includedir}/osso-fpu.h
 %{_includedir}/osso-log.h
 %{_includedir}/osso-mem.h
 %{_pkgconfigdir}/libosso.pc
diff --git a/libosso-opt.patch b/libosso-opt.patch
index bd4eea8..29a93cc 100644
--- a/libosso-opt.patch
+++ b/libosso-opt.patch
@@ -1,28 +1,14 @@
---- libosso-1.20/src/Makefile.am.orig	2006-10-10 12:46:34.000000000 +0200
-+++ libosso-1.20/src/Makefile.am	2007-06-03 20:59:01.247276880 +0200
-@@ -1,5 +1,5 @@
--CFLAGS = $(OSSO_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(GNOMEVFS_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/src \
--		 -DOSSO_CTRLPANELPLUGINDIR=\"${prefix}/lib/hildon-control-panel\"
-+AM_CFLAGS = $(OSSO_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(GNOMEVFS_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/src \
-+		 -DOSSO_CTRLPANELPLUGINDIR=\"${libdir}/hildon-control-panel\"
- 
- INCLUDES = \
- 	-DPREFIX=\"${prefix}\"
---- libosso-1.20/configure.ac.orig	2006-10-10 12:46:34.000000000 +0200
-+++ libosso-1.20/configure.ac	2007-06-03 20:58:24.385176228 +0200
-@@ -20,12 +20,12 @@ AC_ARG_ENABLE(debug, 
- ## g_array_index gives bogus warnings for -Wcast-align on ARM, so we
- ## don't us that warning as well.
- 
--WFLAGS="-Werror -Wall -Wmissing-prototypes -std=c99"
-+WFLAGS="-Wall -Wmissing-prototypes -std=c99"
+--- libosso-2.35/configure.ac.orig	2019-10-02 17:11:56.779069364 +0200
++++ libosso-2.35/configure.ac	2019-10-02 17:13:14.401982178 +0200
+@@ -46,9 +46,9 @@
+ WFLAGS="-Wall -Wmissing-prototypes -std=c99"
  if test x${libosso_use_debug} = xyes ; then
-     AC_DEFINE(DEBUG,1,[Build extra debug code])
--    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -rdynamic $WFLAGS"
-+    OSSO_CFLAGS="-ansi -D_BSD_SOURCE -rdynamic $WFLAGS"
+     AC_DEFINE([LIBOSSO_DEBUG],1,[Build extra debug code])
+-    OSSO_CFLAGS="-g -ansi -D_DEFAULT_SOURCE -D_GNU_SOURCE -rdynamic $WFLAGS"
++    OSSO_CFLAGS="-ansi -D_DEFAULT_SOURCE -D_GNU_SOURCE -rdynamic $WFLAGS"
  else
--    OSSO_CFLAGS="-g -ansi -D_BSD_SOURCE -O2 -rdynamic $WFLAGS"
-+    OSSO_CFLAGS="-ansi -D_BSD_SOURCE -rdynamic $WFLAGS"
+-    OSSO_CFLAGS="-g -ansi -D_DEFAULT_SOURCE -D_GNU_SOURCE -O2 -rdynamic $WFLAGS"
++    OSSO_CFLAGS="-ansi -D_DEFAULT_SOURCE -D_GNU_SOURCE -rdynamic $WFLAGS"
  fi
  
- AC_SUBST(OSSO_CFLAGS)
+ AC_SUBST([OSSO_CFLAGS])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libosso.git/commitdiff/3342bf4f1a7f80c9a34f6f84e43e00e7f68b74be