Hello community, here is the log from the commit of package libindicator for openSUSE:Factory checked in at 2014-03-22 14:44:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libindicator (Old) and /work/SRC/openSUSE:Factory/.libindicator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libindicator" Changes: -------- --- /work/SRC/openSUSE:Factory/libindicator/libindicator.changes 2013-12-18 19:20:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libindicator.new/libindicator.changes 2014-03-22 18:01:19.000000000 +0100 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Fri Mar 7 19:43:41 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 12.10.2+14.04.20140304 + * Latest release available in Ubuntu archives - no changelog provided +- Enable build of GTK-3.0 subpackage +- Added dont-build-debug-tools.patch, tools are used only for tests + & developing indicators. Also, it pulls libido requirement, which + does not exists on openSUSE + +------------------------------------------------------------------- Old: ---- libindicator-12.10.1.tar.gz New: ---- dont-build-debug-tools.patch libindicator_12.10.2+14.04.20140304.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindicator.spec ++++++ --- /var/tmp/diff_new_pack.SK39zZ/_old 2014-03-22 18:01:19.000000000 +0100 +++ /var/tmp/diff_new_pack.SK39zZ/_new 2014-03-22 18:01:19.000000000 +0100 @@ -1,6 +1,7 @@ -# spec file for libindicator # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# spec file for package libindicator +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +13,46 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + Name: libindicator -%define _name libindicator7 -Version: 12.10.1 +%define _gtk2_name libindicator7 +%define _gtk3_name libindicator3-7 +Version: 12.10.2+14.04.20140304 Release: 0 -License: GPL-3.0 Summary: Panel indicator applet libraries -Url: https://launchpad.net/libindicator +License: GPL-3.0 Group: System/GUI/Other -Source: %{name}-%{version}.tar.gz - +Url: https://launchpad.net/libindicator +Source: %{name}_%{version}.orig.tar.gz +# PATCH-FIX-OPENSUSE dont-build-debug-tools.patch -- they are used only for tests & developing indicators. +# also, it pulls libido requirement, which does not exists on openSUSE +Patch0: dont-build-debug-tools.patch +BuildRequires: gnome-common BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) %description This library contains information to build indicators to go into the indicator applet. -%package -n %{_name} +%package -n %{_gtk2_name} Summary: Panel indicator applet - shared libraries Group: System/Libraries -%description -n %{_name} +%description -n %{_gtk2_name} +This package provides the libraries required to build indicators and to go into +the indicator applet. + +%package -n %{_gtk3_name} +Summary: Panel indicator applet - shared libraries +Group: System/Libraries + +%description -n %{_gtk3_name} This package provides the libraries required to build indicators and to go into the indicator applet. @@ -44,47 +60,83 @@ %package devel Summary: Panel indicator applet - development files Group: Development/Libraries/Other -Requires: %{_name} = %{version} +Requires: %{_gtk2_name} = %{version} %description devel This package provides the development files required to build indicators and to go into the indicator applet. +%package -n libindicator3-devel +Summary: Panel indicator applet - development files +Group: Development/Libraries/Other +Requires: %{_gtk3_name} = %{version} + +%description -n libindicator3-devel +This package provides the development files required to build indicators and to +go into the indicator applet. + %prep -%setup -q +%setup -q -n %{name}-%{version} +%patch0 -p1 %build -%configure \ - --disable-static \ - --libexecdir=%{_libexecdir} \ - --with-gtk=2 +%global _configure ../configure +NOCONFIGURE=1 sh autogen.sh +export V=1 +mkdir -p build-gtk2 build-gtk3 + +pushd build-gtk2 +%configure --with-gtk=2 --disable-static +make %{?_smp_mflags} +popd + +pushd build-gtk3 +%configure --with-gtk=3 --disable-static make %{?_smp_mflags} +popd %install -%makeinstall +pushd build-gtk2 +%make_install +popd + +pushd build-gtk3 +%make_install +popd + find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print -if [ -f %{buildroot}%{_datadir}/%{name}/80indicator-debugging ]; then - rm %{buildroot}%{_datadir}/%{name}/80indicator-debugging -fi # this dummy indicator is fairly useless, it's not shipped in Ubuntu rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so -%post -n %{_name} -p /sbin/ldconfig +%post -n %{_gtk2_name} -p /sbin/ldconfig -%postun -n %{_name} -p /sbin/ldconfig +%postun -n %{_gtk2_name} -p /sbin/ldconfig -%files -n %{_name} +%post -n %{_gtk3_name} -p /sbin/ldconfig + +%postun -n %{_gtk3_name} -p /sbin/ldconfig + +%files -n %{_gtk2_name} %defattr(-,root,root) %doc AUTHORS COPYING -%{_libdir}/*.so.* +%{_libdir}/%{name}.so.* + +%files -n %{_gtk3_name} +%defattr(-,root,root) +%doc AUTHORS COPYING +%{_libdir}/%{name}3.so.* %files devel %defattr(-,root,root) -%dir %{_datadir}/%{name} -%{_includedir}/libindicator-0.4/ -%{_libexecdir}/indicator-loader -%{_libdir}/pkgconfig/*.pc -%{_libdir}/*.so +%{_includedir}/%{name}-0.4/ +%{_libdir}/pkgconfig/indicator-0.4.pc +%{_libdir}/%{name}.so + +%files -n libindicator3-devel +%defattr(-,root,root) +%{_includedir}/%{name}3-0.4/ +%{_libdir}/pkgconfig/indicator3-0.4.pc +%{_libdir}/%{name}3.so %changelog ++++++ dont-build-debug-tools.patch ++++++ diff -Naur libindicator-12.10.2+14.04.20140304/configure.ac libindicator-12.10.2+14.04.20140304.new/configure.ac --- libindicator-12.10.2+14.04.20140304/configure.ac 2014-03-04 11:58:13.000000000 +0100 +++ libindicator-12.10.2+14.04.20140304.new/configure.ac 2014-03-07 20:26:24.409011006 +0100 @@ -45,7 +45,6 @@ GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=3.6 GIO_UNIX_REQUIRED_VERSION=2.37 -IDO_REQUIRED_VERSION=13.10.0 AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], @@ -55,8 +54,7 @@ AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gmodule-2.0 - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - libido3-0.1 >= $IDO_REQUIRED_VERSION) + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION @@ -156,7 +154,6 @@ libindicator/indicator-0.4.pc.in libindicator/indicator3-0.4.pc.in tests/Makefile -tools/Makefile ]) AC_OUTPUT @@ -170,7 +167,7 @@ Prefix: $prefix GTK+ Version: $with_gtk - + Enable tests: $enable_tests Enable debugging: $enable_debug Coverage reporting: $use_gcov diff -Naur libindicator-12.10.2+14.04.20140304/Makefile.am libindicator-12.10.2+14.04.20140304.new/Makefile.am --- libindicator-12.10.2+14.04.20140304/Makefile.am 2014-03-04 11:58:13.000000000 +0100 +++ libindicator-12.10.2+14.04.20140304.new/Makefile.am 2014-03-07 20:36:26.104488777 +0100 @@ -1,10 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ - libindicator \ - tools - -tools: libindicator + libindicator if WANT_TESTS SUBDIRS += \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
