Hello community, here is the log from the commit of package libindicator for openSUSE:Factory checked in at 2015-10-19 22:53:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-06-16 14:05:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libindicator.new/libindicator.changes 2015-10-20 00:08:34.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Oct 18 21:25:43 UTC 2015 - [email protected] + +- fix-compilation.patch: fix "cannot find -lglib-2.0-lm" + compilation error. + +------------------------------------------------------------------- New: ---- fix-compilation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindicator.spec ++++++ --- /var/tmp/diff_new_pack.AZvHfm/_old 2015-10-20 00:08:35.000000000 +0200 +++ /var/tmp/diff_new_pack.AZvHfm/_new 2015-10-20 00:08:35.000000000 +0200 @@ -16,8 +16,9 @@ # -%define lname libindicator3-7 -%define lname_gtk2 libindicator7 +%define soname libindicator3 +%define soname_gtk2 libindicator +%define sover 7 %define _version 12.10.2+14.10.20140922 Name: libindicator Version: 12.10.2+bzr20140922 @@ -29,9 +30,12 @@ Source: http://archive.ubuntu.com/ubuntu/pool/main/libi/%{name}/%{name}_%{_version}.orig.tar.gz # PATCH-FIX-OPENSUSE dont-build-debug-tools.patch [email protected] -- Do not build debug tools that are used only for tests & developing indicators, which pulls libido. Patch0: dont-build-debug-tools.patch +# PATCH-FIX-OPENSUSE fix-compilation.patch [email protected] -- Fix "cannot find -lglib-2.0-lm" compilation error. +Patch1: fix-compilation.patch BuildRequires: gnome-common BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -39,47 +43,49 @@ This library contains information to build indicators to go into the indicator applet. -%package -n %{lname} +%package -n %{soname}-%{sover} Summary: Panel indicator applet - Shared Libraries Group: System/Libraries -%description -n %{lname} +%description -n %{soname}-%{sover} This package provides the libraries required to build indicators and to go into the indicator applet. -%package -n %{lname_gtk2} +%package -n %{soname_gtk2}%{sover} Summary: Panel indicator applet -- Shared Libraries Group: System/Libraries -%description -n %{lname_gtk2} +%description -n %{soname_gtk2}%{sover} This package provides the libraries required to build indicators and to go into the indicator applet. -%package -n libindicator3-devel +%package -n %{soname}-devel Summary: Panel indicator applet -- Development Files Group: Development/Libraries/Other -Requires: %{lname} = %{version} +Requires: %{soname}-%{sover} = %{version} -%description -n libindicator3-devel +%description -n %{soname}-devel This package provides the development files required to build indicators and to go into the indicator applet. -%package devel +%package -n %{soname_gtk2}-devel Summary: Panel indicator applet -- Development Files Group: Development/Libraries/Other -Requires: %{lname_gtk2} = %{version} +Requires: %{soname_gtk2}%{sover} = %{version} -%description devel +%description -n %{soname_gtk2}-devel This package provides the development files required to build indicators and to go into the indicator applet. %prep %setup -q -n %{name}-%{_version} %patch0 -p1 +%patch1 -p1 %build + %global _configure ../configure -NOCONFIGURE=1 ./autogen.sh +NOCONFIGURE=1 gnome-autogen.sh for ver in 2 3; do mkdir build-gtk$ver pushd build-gtk$ver @@ -99,34 +105,34 @@ # This dummy indicator is fairly useless, it is not shipped in Ubuntu. rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so -%post -n %{lname} -p /sbin/ldconfig +%post -n %{soname}-%{sover} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%postun -n %{soname}-%{sover} -p /sbin/ldconfig -%post -n %{lname_gtk2} -p /sbin/ldconfig +%post -n %{soname_gtk2}%{sover} -p /sbin/ldconfig -%postun -n %{lname_gtk2} -p /sbin/ldconfig +%postun -n %{soname_gtk2}%{sover} -p /sbin/ldconfig -%files -n %{lname} +%files -n %{soname}-%{sover} %defattr(-,root,root) %doc AUTHORS COPYING NEWS -%{_libdir}/%{name}3.so.* +%{_libdir}/%{soname}.so.%{sover}* -%files -n %{lname_gtk2} +%files -n %{soname_gtk2}%{sover} %defattr(-,root,root) %doc AUTHORS COPYING NEWS -%{_libdir}/%{name}.so.* +%{_libdir}/%{soname_gtk2}.so.%{sover}* -%files -n libindicator3-devel +%files -n %{soname}-devel %defattr(-,root,root) -%{_includedir}/%{name}3-0.4/ -%{_libdir}/%{name}3.so +%{_includedir}/%{soname}-0.4/ +%{_libdir}/%{soname}.so %{_libdir}/pkgconfig/indicator3-0.4.pc -%files devel +%files -n %{soname_gtk2}-devel %defattr(-,root,root) -%{_includedir}/%{name}-0.4/ -%{_libdir}/%{name}.so +%{_includedir}/%{soname_gtk2}-0.4/ +%{_libdir}/%{soname_gtk2}.so %{_libdir}/pkgconfig/indicator-0.4.pc %changelog ++++++ fix-compilation.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,7 @@ AS_IF([test "x$with_gtk" = x3], AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) LT_LIB_M -LIBINDICATOR_LIBS+="$LIBM" +LIBINDICATOR_LIBS+=" $LIBM" ############################## # Custom Junk
