commit d872b21f084474c07016503cd78f94ddb22c8216
Author: Jan Palus <[email protected]>
Date: Fri Nov 19 12:10:32 2021 +0100
up to 0.9.0
build-type.patch | 16 ++++++++++++++++
libayatana-indicator.spec | 46 ++++++++++++++++++----------------------------
2 files changed, 34 insertions(+), 28 deletions(-)
---
diff --git a/libayatana-indicator.spec b/libayatana-indicator.spec
index c4f67c3..b87ce34 100644
--- a/libayatana-indicator.spec
+++ b/libayatana-indicator.spec
@@ -4,22 +4,22 @@
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: libayatana-indicator
-Version: 0.8.4
+Version: 0.9.0
Release: 1
License: GPL v3
Group: Libraries
#Source0Download:
https://github.com/AyatanaIndicators/libayatana-indicator/releases
Source0:
https://github.com/AyatanaIndicators/libayatana-indicator/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 5b61141bbd42ba5a161e59adcaafc9d8
+# Source0-md5: 0a4ddcdfe1b11ec122687c9a1d76a86c
+Patch0: build-type.patch
URL: https://github.com/AyatanaIndicators/libayatana-indicator
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11
-BuildRequires: ayatana-ido-devel >= 0.8.0
+BuildRequires: ayatana-ido-devel >= 0.8.2
+BuildRequires: cmake >= 3.13
BuildRequires: glib2-devel >= 1:2.37
BuildRequires: gtk+2-devel >= 2:2.18
-BuildRequires: gtk+3-devel >= 3.6
-BuildRequires: libtool >= 2:2.2
+BuildRequires: gtk+3-devel >= 3.24
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: sed >= 4.0
BuildRequires: which
Requires: glib2 >= 1:2.37
@@ -56,7 +56,7 @@ 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.37
-Requires: gtk+3 >= 3.6
+Requires: gtk+3 >= 3.24
%description gtk3
A set of symbols and convenience functions that all Ayatana indicators
@@ -72,7 +72,7 @@ Summary(pl.UTF-8): Pliki programistyczne biblioteki
libayatana-indicator (wersja
Group: Development/Libraries
Requires: %{name}-gtk3 = %{version}-%{release}
Requires: glib2-devel >= 1:2.37
-Requires: gtk+3-devel >= 3.6
+Requires: gtk+3-devel >= 3.24
%description gtk3-devel
This package contains the header files for developing applications
@@ -85,13 +85,9 @@ wykorzystujących bibliotekę libayatana-indicator (w wersji
dla GTK+
%prep
%setup -q
+%patch0 -p1
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__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
# libayatana-indicator-gtk3. When we have no need for the GTK+ 2 build any more
@@ -99,17 +95,15 @@ wykorzystujących bibliotekę libayatana-indicator (w wersji
dla GTK+
# GTK+ 3.
install -d build-gtk{2,3}
cd build-gtk2
-../%configure \
- --disable-silent-rules \
- --disable-static \
- --with-gtk=2
+%cmake \
+ -DFLAVOUR_GTK2:BOOL=ON \
+ ..
%{__make}
cd ../build-gtk3
-../%configure \
- --disable-silent-rules \
- --disable-static \
- --with-gtk=3
+%cmake \
+ -DFLAVOUR_GTK3:BOOL=ON \
+ ..
%{__make}
%install
@@ -120,15 +114,10 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build-gtk3 install -j1 \
DESTDIR=$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}/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
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -161,7 +150,8 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog NEWS
%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 %{_libexecdir}/libayatana-indicator
+%attr(755,root,root)
%{_libexecdir}/libayatana-indicator/ayatana-indicator-loader3
%dir %{_libdir}/ayatana-indicators3
%dir %{_libdir}/ayatana-indicators3/7
%dir %{_datadir}/libayatana-indicator
diff --git a/build-type.patch b/build-type.patch
new file mode 100644
index 0000000..5ef7f39
--- /dev/null
+++ b/build-type.patch
@@ -0,0 +1,16 @@
+--- libayatana-indicator-0.9.0/CMakeLists.txt.orig 2021-11-17
14:11:58.000000000 +0100
++++ libayatana-indicator-0.9.0/CMakeLists.txt 2021-11-19 11:58:38.251823192
+0100
+@@ -11,13 +11,6 @@
+ option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests
and checks)" OFF)
+ option(ENABLE_WERROR "Treat all build warnings as errors" OFF)
+
+-if(ENABLE_COVERAGE)
+- set(ENABLE_TESTS ON)
+- set(CMAKE_BUILD_TYPE "Coverage")
+-else()
+- set(CMAKE_BUILD_TYPE "Release")
+-endif()
+-
+ if(ENABLE_WERROR)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libayatana-indicator.git/commitdiff/d872b21f084474c07016503cd78f94ddb22c8216
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
