From 8caa230c51ffd7a8429d23a61d6900b594ac527d Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 13 May 2021 13:11:33 +0200 Subject: [PATCH] new maintained version of libindicator --- libayatana-indicator.spec | 103 +++++++++++++++++++------------------- libindicator-sh.patch | 11 ---- 2 files changed, 52 insertions(+), 62 deletions(-) delete mode 100644 libindicator-sh.patch diff --git a/libayatana-indicator.spec b/libayatana-indicator.spec index d601694..c4f67c3 100644 --- a/libayatana-indicator.spec +++ b/libayatana-indicator.spec @@ -1,25 +1,28 @@ +# TODO: +# - package systemd user target unit + Summary: Shared functions for Ayatana indicators (GTK+ 2.x version) Summary(pl.UTF-8): Funkcje współdzielone dla wskaźników Ayatana (wersja dla GTK+ 2.x) -Name: libindicator -Version: 12.10.1 -Release: 3 +Name: libayatana-indicator +Version: 0.8.4 +Release: 1 License: GPL v3 Group: Libraries -#Source0Download: https://launchpad.net/libindicator/+download -Source0: http://launchpad.net/libindicator/12.10/%{version}/+download/%{name}-%{version}.tar.gz -# Source0-md5: 5fd4d6bab339fc9611078b64c44a85a8 -Patch0: %{name}-sh.patch -URL: https://launchpad.net/libindicator +#Source0Download: https://github.com/AyatanaIndicators/libayatana-indicator/releases +Source0: https://github.com/AyatanaIndicators/libayatana-indicator/archive/%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 5b61141bbd42ba5a161e59adcaafc9d8 +URL: https://github.com/AyatanaIndicators/libayatana-indicator BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1:1.11 -BuildRequires: glib2-devel >= 1:2.22 +BuildRequires: ayatana-ido-devel >= 0.8.0 +BuildRequires: glib2-devel >= 1:2.37 BuildRequires: gtk+2-devel >= 2:2.18 -BuildRequires: gtk+3-devel >= 3.0 +BuildRequires: gtk+3-devel >= 3.6 BuildRequires: libtool >= 2:2.2 BuildRequires: pkgconfig BuildRequires: sed >= 4.0 BuildRequires: which -Requires: glib2 >= 1:2.22 +Requires: glib2 >= 1:2.37 Requires: gtk+2 >= 2:2.18 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -32,27 +35,28 @@ Zbiór symboli i wygodnych funkcji, które mogą być używane przez wszystkie wskaźniki Ayatana. Ten pakiet zawiera wersję dla GTK+ 2.x. %package devel -Summary: Development files for libindicator (GTK+ 2.x version) -Summary(pl.UTF-8): Pliki programistyczne biblioteki libindicator (wersja dla GTK+ 2.x) +Summary: Development files for libayatana-indicator (GTK+ 2.x version) +Summary(pl.UTF-8): Pliki programistyczne biblioteki libayatana-indicator (wersja dla GTK+ 2.x) Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: glib2-devel >= 1:2.22 +Requires: glib2-devel >= 1:2.37 Requires: gtk+2-devel >= 2:2.18 %description devel This package contains the header files for developing applications -that use libindicator (GTK+ 2.x version). +that use libayatana-indicator (GTK+ 2.x version). %description devel -l pl.UTF-8 Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji -wykorzystujących bibliotekę libindicator (w wersji dla GTK+ 2.x). +wykorzystujących bibliotekę libayatana-indicator (w wersji dla GTK+ +2.x). %package gtk3 Summary: Shared functions for Ayatana indicators (GTK+ 3.x version) Summary(pl.UTF-8): Funkcje współdzielone dla wskaźników Ayatana (wersja dla GTK+ 3.x) Group: Libraries -Requires: glib2 >= 1:2.22 -Requires: gtk+3 >= 3.0 +Requires: glib2 >= 1:2.37 +Requires: gtk+3 >= 3.6 %description gtk3 A set of symbols and convenience functions that all Ayatana indicators @@ -63,26 +67,24 @@ Zbiór symboli i wygodnych funkcji, które mogą być używane przez wszystkie wskaźniki Ayatana. Ten pakiet zawiera wersję dla GTK+ 3.x. %package gtk3-devel -Summary: Development files for libindicator (GTK+ 3.x version) -Summary(pl.UTF-8): Pliki programistyczne biblioteki libindicator (wersja dla GTK+ 3.x) +Summary: Development files for libayatana-indicator (GTK+ 3.x version) +Summary(pl.UTF-8): Pliki programistyczne biblioteki libayatana-indicator (wersja dla GTK+ 3.x) Group: Development/Libraries Requires: %{name}-gtk3 = %{version}-%{release} -Requires: glib2-devel >= 1:2.22 -Requires: gtk+3-devel >= 3.0 +Requires: glib2-devel >= 1:2.37 +Requires: gtk+3-devel >= 3.6 %description gtk3-devel This package contains the header files for developing applications -that use libindicator (GTK+ 3.x version). +that use libayatana-indicator (GTK+ 3.x version). %description gtk3-devel -l pl.UTF-8 Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji -wykorzystujących bibliotekę libindicator (w wersji dla GTK+ 3.x). +wykorzystujących bibliotekę libayatana-indicator (w wersji dla GTK+ +3.x). %prep %setup -q -%patch0 -p1 - -%{__sed} -i -e 's|-Werror||g' */Makefile.am %build %{__libtoolize} @@ -92,7 +94,7 @@ wykorzystujących bibliotekę libindicator (w wersji dla GTK+ 3.x). %{__automake} # we build it twice, once against GTK+ 3 and once against GTK+ 2, so # both GTK+ 2 and GTK+ 3 apps can use it; the GTK+ 3 build is -# libindicator-gtk3. When we have no need for the GTK+ 2 build any more +# libayatana-indicator-gtk3. When we have no need for the GTK+ 2 build any more # we can drop the -gtk3 package and have the main package build against # GTK+ 3. install -d build-gtk{2,3} @@ -121,8 +123,8 @@ rm -rf $RPM_BUILD_ROOT %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la # dirs for library users, see .pc files for paths -install -d $RPM_BUILD_ROOT%{_libdir}/{indicators,indicators3}/7 -install -d $RPM_BUILD_ROOT%{_datadir}/libindicator/icons +install -d $RPM_BUILD_ROOT%{_libdir}/ayatana-{indicators,indicators3}/7 +install -d $RPM_BUILD_ROOT%{_datadir}/libayatana-indicator/icons # this dummy indicator is fairly useless, it's not shipped in Ubuntu %{__rm} $RPM_BUILD_ROOT%{_libdir}/libdummy-indicator*.so @@ -139,35 +141,34 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS -%attr(755,root,root) %{_libdir}/libindicator.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libindicator.so.7 -%attr(755,root,root) %{_libexecdir}/indicator-loader -%dir %{_libdir}/indicators -%dir %{_libdir}/indicators/7 -%dir %{_datadir}/libindicator -%dir %{_datadir}/libindicator/icons +%attr(755,root,root) %{_libdir}/libayatana-indicator.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libayatana-indicator.so.7 +%dir %{_libdir}/ayatana-indicators +%dir %{_libdir}/ayatana-indicators/7 +%dir %{_datadir}/libayatana-indicator +%dir %{_datadir}/libayatana-indicator/icons %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libindicator.so -%{_includedir}/libindicator-0.4 -%{_pkgconfigdir}/indicator-0.4.pc +%attr(755,root,root) %{_libdir}/libayatana-indicator.so +%{_includedir}/libayatana-indicator-0.4 +%{_pkgconfigdir}/ayatana-indicator-0.4.pc # This is marked as 'for development use only' -%{_datadir}/libindicator/80indicator-debugging +%{_datadir}/libayatana-indicator/80indicator-debugging %files gtk3 %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS -%attr(755,root,root) %{_libdir}/libindicator3.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libindicator3.so.7 -%attr(755,root,root) %{_libexecdir}/indicator-loader3 -%dir %{_libdir}/indicators3 -%dir %{_libdir}/indicators3/7 -%dir %{_datadir}/libindicator -%dir %{_datadir}/libindicator/icons +%attr(755,root,root) %{_libdir}/libayatana-indicator3.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libayatana-indicator3.so.7 +%attr(755,root,root) %{_libexecdir}/ayatana-indicator-loader3 +%dir %{_libdir}/ayatana-indicators3 +%dir %{_libdir}/ayatana-indicators3/7 +%dir %{_datadir}/libayatana-indicator +%dir %{_datadir}/libayatana-indicator/icons %files gtk3-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libindicator3.so -%{_includedir}/libindicator3-0.4 -%{_pkgconfigdir}/indicator3-0.4.pc +%attr(755,root,root) %{_libdir}/libayatana-indicator3.so +%{_includedir}/libayatana-indicator3-0.4 +%{_pkgconfigdir}/ayatana-indicator3-0.4.pc diff --git a/libindicator-sh.patch b/libindicator-sh.patch deleted file mode 100644 index ab69753..0000000 --- a/libindicator-sh.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libindicator-12.10.1/configure.ac.orig 2012-09-19 17:38:40.047378393 +0200 -+++ libindicator-12.10.1/configure.ac 2013-12-29 10:49:26.640857649 +0100 -@@ -66,7 +66,7 @@ - AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) - - LT_LIB_M --LIBINDICATOR_LIBS+="$LIBM" -+LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS $LIBM" - - ############################## - # Custom Junk -- 2.43.0