commit 7a37c183b3cb4fe3925d0daf2a56a91814123396 Author: overweight <5324761+overweight@user.noreply.gitee.com> Date: Mon Sep 30 10:55:00 2019 -0400 Package init diff --git a/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch b/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch new file mode 100644 index 0000000..3220783 --- /dev/null +++ b/0001-Remove-use-of-G_DISABLE_DEPRECATED.patch @@ -0,0 +1,40 @@ +From fef13a371fc91f6d9b42518126c2a8b459fdf0e8 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 2 May 2013 14:17:38 -0400 +Subject: [PATCH] Remove use of G_DISABLE_DEPRECATED + +This now trips up on GStaticRecMutex; I'm not going to bother to port, +realistically no one is actively maintaining this code anymore. +--- + activation-server/Makefile.am | 1 - + configure.in | 2 +- + 2 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/activation-server/Makefile.am b/activation-server/Makefile.am +index efb18a8..ffa90f6 100644 +--- a/activation-server/Makefile.am ++++ b/activation-server/Makefile.am +@@ -17,7 +17,6 @@ INCLUDES= \ + $(SERVER_CFLAGS) \ + $(WARN_CFLAGS) \ + -DSERVER_CONFDIR=\"$(sysconfdir)\" \ +- -DG_DISABLE_DEPRECATED \ + -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \ + $(NULL) + +diff --git a/configure.in b/configure.in +index 70a4e26..6be2bca 100644 +--- a/configure.in ++++ b/configure.in +@@ -132,7 +132,7 @@ AC_SUBST(SERVER_LIBS) + AC_SUBST(SERVER_CFLAGS) + + if test "$enable_maintainer_mode" = "yes"; then +- DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES" ++ DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES" + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) + fi + +-- +1.7.1 + diff --git a/libbonobo-2.32.1-srcdir-macro.patch b/libbonobo-2.32.1-srcdir-macro.patch new file mode 100644 index 0000000..b535196 --- /dev/null +++ b/libbonobo-2.32.1-srcdir-macro.patch @@ -0,0 +1,11 @@ +--- tests/Makefile.am~ 2010-08-29 06:56:00.000000000 -0500 ++++ tests/Makefile.am 2013-02-07 13:47:03.187506469 -0600 +@@ -55,7 +55,7 @@ + MODELS_DIR="$(srcdir)/models" + + TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \ +- test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \ ++ test-stream-mem$(EXEEXT) tests/test-properties.sh test-storage-mem$(EXEEXT) \ + test-main-loop$(EXEEXT) + + # TESTS += test-generic-factory.sh diff --git a/libbonobo-2.32.1.tar.bz2 b/libbonobo-2.32.1.tar.bz2 new file mode 100644 index 0000000..44baf5b Binary files /dev/null and b/libbonobo-2.32.1.tar.bz2 differ diff --git a/libbonobo-multishlib.patch b/libbonobo-multishlib.patch new file mode 100644 index 0000000..5be12c7 --- /dev/null +++ b/libbonobo-multishlib.patch @@ -0,0 +1,20 @@ +diff -up libbonobo-2.23.1/activation-server/Makefile.am.multishlib libbonobo-2.23.1/activation-server/Makefile.am +--- libbonobo-2.23.1/activation-server/Makefile.am.multishlib 2007-01-01 18:46:55.000000000 -0500 ++++ libbonobo-2.23.1/activation-server/Makefile.am 2008-08-22 20:23:53.000000000 -0400 +@@ -6,13 +6,15 @@ bin_PROGRAMS=activation-client + libexec_PROGRAMS=bonobo-activation-server + noinst_PROGRAMS=test-performance + ++serverinfolibdir = $(libdir)/bonobo/servers:$(exec_prefix)/lib/bonobo/servers ++ + INCLUDES= \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_builddir)/bonobo-activation \ + -I$(top_srcdir)/bonobo-activation \ + -DPREFIX=\""$(prefix)"\" \ +- -DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \ ++ -DSERVERINFODIR=\"$(serverinfolibdir)\" \ + -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ + $(SERVER_CFLAGS) \ + $(WARN_CFLAGS) \ diff --git a/libbonobo.spec b/libbonobo.spec new file mode 100644 index 0000000..fa796d0 --- /dev/null +++ b/libbonobo.spec @@ -0,0 +1,92 @@ +Name: libbonobo +Version: 2.32.1 +Release: 16 +License: GPLv2+ and LGPLv2+ +Summary: Bonobo component system +URL: https://ftp.gnome.org +Source0: https://download.gnome.org/sources/libbonobo/2.32/%{name}-%{version}.tar.bz2 + +BuildRequires: libxml2-devel ORBit2-devel intltool automake autoconf libtool gtk-doc +BuildRequires: flex bison zlib-devel popt-devel dbus-glib-devel gettext + +Patch0: libbonobo-multishlib.patch +Patch1: libbonobo-2.32.1-srcdir-macro.patch +Patch2: 0001-Remove-use-of-G_DISABLE_DEPRECATED.patch + +%description +Bonobo is a component system based on CORBA, used by the GNOME desktop. + +%package devel +Summary: Libraries and headers for %{name} +Requires: %{name} = %{version}-%{release} +Requires: ORBit2-devel libxml2-devel popt-devel + +%description devel +The %{name}-devel package contains libraries and header files for %{name}. + +%package_help + +%prep +%setup -n %{name}-%{version} + +%ifarch x86_64 +%patch0 -p1 -b .multishlib +%endif + +%patch1 -p0 -b .srcmacro +%patch2 -p1 + +autoreconf -i -f + +%build +%configure --disable-gtk-doc + +make + +%install +%make_install + +%delete_la + +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile +done + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/bonobo/servers + +%ldconfig_scriptlets + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING +%{_libdir}/*.so.* +%{_libdir}/bonobo +%{_libdir}/orbit-2.0/*.so* +%{_bindir}/* +%{_libexecdir}/* +%{_sbindir}/* +%{_datadir}/locale/* +%dir %{_prefix}/lib/bonobo/servers +%config %{_sysconfdir}/bonobo-activation/* +%exclude %{_libdir}/bonobo-2.0/samples/bonobo-echo-2 +%exclude %{_prefix}/lib/bonobo-2.0/samples/bonobo-echo-2 + +%files devel +%defattr(-,root,root) +%{_libdir}/*.so +%{_libdir}/*.a +%{_libdir}/orbit-2.0/*.a +%{_libdir}/pkgconfig/* +%{_includedir}/* +%{_datadir}/idl/* + +%files help +%defattr(-,root,root) +%doc NEWS README doc/NAMESPACE +%{_datadir}/gtk-doc/html/libbonobo +%{_datadir}/gtk-doc/html/bonobo-activation +%{_datadir}/man/man*/* + +%changelog +* Thu Sep 05 2019 openEuler Buildteam - 2.32.1-16 +- Package init