[packages/bamf3] - bamf.spec updated to 0.5.6, only gtk+3 now
qboosh
qboosh at pld-linux.org
Sun Aug 31 07:15:57 CEST 2025
commit 14f34753c73af785a1103ea1c13d63a859b79493
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Aug 31 07:18:38 2025 +0200
- bamf.spec updated to 0.5.6, only gtk+3 now
bamf-gir.patch | 12 ---
bamf.spec => bamf3.spec | 193 ++++++++++++++----------------------------------
2 files changed, 54 insertions(+), 151 deletions(-)
---
diff --git a/bamf.spec b/bamf3.spec
similarity index 50%
rename from bamf.spec
rename to bamf3.spec
index 4edd4a6..422b6fe 100644
--- a/bamf.spec
+++ b/bamf3.spec
@@ -1,14 +1,12 @@
-# TODO: libunity-webapps support?
#
# Conditional build:
+%bcond_without dbusmenu # exported window actions menus
%bcond_without apidocs # API documentation
-%bcond_without gtk2 # GTK+ 2 library
-%bcond_without gtk3 # GTK+ 3 library
-Summary: Application matching framework
-Summary(pl.UTF-8): Szkielet do dopasowywania aplikacji
-Name: bamf
-Version: 0.3.6
+Summary: Application matching framework (GTK+ 3 library)
+Summary(pl.UTF-8): Szkielet do dopasowywania aplikacji (biblioteka GTK+ 3)
+Name: bamf3
+Version: 0.5.6
Release: 1
# Library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+);
# non-lib bits are GPLv3.
@@ -19,28 +17,33 @@ Release: 1
# License: LGPL v2.1 or LGPL v3
License: GPL v2 or GPL v3
Group: Libraries
-Source0: https://launchpad.net/bamf/0.3/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: 56b0b0ac2d3f2a0401db268c78cc8527
-Patch0: %{name}-gir.patch
+Source0: https://launchpad.net/bamf/0.5/%{version}/+download/bamf-%{version}.tar.gz
+# Source0-md5: 49ed19dd5db0b4109f4dc2e4fe2ed13d
URL: https://launchpad.net/bamf
-BuildRequires: autoconf >= 2.63
+BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.11
-BuildRequires: dbus-glib-devel >= 0.76
-BuildRequires: glib2-devel >= 1:2.30.0
+BuildRequires: glib2-devel >= 1:2.38.0
BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel >= 0.10.2
-%{?with_gtk2:BuildRequires: gtk+2-devel >= 1:2.0}
-%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0}
+BuildRequires: gtk+3-devel >= 3.0
BuildRequires: gtk-doc >= 1.0
+%if %{with dbusmenu}
+BuildRequires: libdbusmenu-devel >= 0.4
+BuildRequires: libdbusmenu-gtk3-devel >= 0.4
+%endif
BuildRequires: libgtop-devel >= 2.0
-%{?with_gtk3:BuildRequires: libwnck-devel >= 3}
-%{?with_gtk2:BuildRequires: libwnck2-devel >= 2.0}
+BuildRequires: libtool >= 2:2
+BuildRequires: libwnck-devel >= 3.4.7
BuildRequires: pkgconfig
+BuildRequires: python3 >= 1:3
+BuildRequires: python3-lxml
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 2.043
+BuildRequires: startup-notification-devel
BuildRequires: vala
BuildRequires: xorg-lib-libX11-devel
-Requires: glib2 >= 1:2.30.0
+Requires: glib2 >= 1:2.38.0
+Requires: libwnck >= 3.4.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -57,13 +60,12 @@ dopasowywanie aplikacji z zaskakującym poziomem dokładności
bibliotekę bamf zbudowaną dla GTK+ 2.
%package devel
-Summary: Development files for BAMF library (GTK+ 2 build)
-Summary(pl.UTF-8): Pliki programistyczne biblioteki BAMF (dla GTK+ 2)
+Summary: Development files for BAMF library (GTK+ 3 build)
+Summary(pl.UTF-8): Pliki programistyczne biblioteki BAMF (dla GTK+ 3)
License: GPL v2 or GPL v3
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 1:2.30.0
-Requires: libwnck2-devel >= 2.0
+Requires: glib2-devel >= 1:2.38.0
%description devel
This package contains header files for developing applications that
@@ -73,53 +75,17 @@ use BAMF with GTK+ 2.
Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
wykorzystujących BAMF z GTK+ 2.
-%package -n vala-libbamf
-Summary: Vala API for BAMF library (GTK+ 2 build)
-Summary(pl.UTF-8): API języka Vala do biblioteki BAMF (dla GTK+ 2)
+%package -n vala-libbamf3
+Summary: Vala API for BAMF library (GTK+ 3 build)
+Summary(pl.UTF-8): API języka Vala do biblioteki BAMF (dla GTK+ 3)
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
-%description -n vala-libbamf
-Vala API for BAMF library (GTK+ 2 build).
-
-%description -n vala-libbamf -l pl.UTF-8
-API języka Vala do biblioteki BAMF (dla GTK+ 2).
-
-%package -n bamf3
-Summary: Application matching framework (GTK+ 3 library)
-Summary(pl.UTF-8): Szkielet do dopasowywania aplikacji (biblioteka GTK+ 3)
-Group: Libraries
-Requires: glib2 >= 1:2.30.0
-
-%description -n bamf3
-BAMF removes the headache of applications matching into a simple DBus
-daemon and C wrapper library. Currently features application matching
-at amazing levels of accuracy (covering nearly every corner case).
-This package contains the bamf library built against GTK+ 3.
-
-%description -n bamf3 -l pl.UTF-8
-BAMF rozwiązuje problem dopasowywania aplikacji za pomocą prostego
-demona DBus i biblioteki obudowującej w C. Aktualne możliwości to
-dopasowywanie aplikacji z zaskakującym poziomem dokładności
-(obejmującym prawie każdy przypadek brzegowy). Ten pakiet zawiera
-bibliotekę bamf zbudowaną dla GTK+ 3.
+%description -n vala-libbamf3
+Vala API for BAMF library (GTK+ 3 build).
-%package -n bamf3-devel
-Summary: Development files for BAMF library (GTK+ 3 build)
-Summary(pl.UTF-8): Pliki programistyczne biblioteki BAMF (dla GTK+ 3)
-License: GPL v2 or GPL v3
-Group: Development/Libraries
-Requires: bamf3 = %{version}-%{release}
-Requires: glib2-devel >= 1:2.30.0
-Requires: libwnck-devel >= 3.0
-
-%description -n bamf3-devel
-This package contains libraries and header files for developing
-applications that use BAMF with GTK+ 3.
-
-%description -n bamf3-devel -l pl.UTF-8
-Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
-wykorzystujących BAMF z GTK+ 3.
+%description -n vala-libbamf3 -l pl.UTF-8
+API języka Vala do biblioteki BAMF (dla GTK+ 3).
%package apidocs
Summary: BAMF API documentation
@@ -138,8 +104,8 @@ Summary: Application matching framework
Summary(pl.UTF-8): Szkielet do dopasowywania aplikacji
License: GPL v3
Group: Daemons
-Requires: dbus-glib >= 0.76
-Requires: glib2 >= 1:2.30.0
+Requires: glib2 >= 1:2.38.0
+Obsoletes: bamf-daemon < 0.4
%description daemon
BAMF removes the headache of applications matching into a simple DBus
@@ -155,12 +121,7 @@ dopasowywanie aplikacji z zaskakującym poziomem dokładności
demona bamf i dane pomocnicze.
%prep
-%setup -q
-%patch -P0 -p1
-
-# ../.././src/bamf-legacy-window.c: In function 'bamf_legacy_window_get_class_name':
-# ../.././src/bamf-legacy-window.c:144:3: error: 'wnck_class_group_get_res_class' is deprecated (declared at /usr/include/libwnck-3.0/libwnck/class-group.h:89): Use 'wnck_class_group_get_id' instead [-Werror=deprecated-declarations]
-%{__sed} -i -e 's/-Werror //' configure.in
+%setup -q -n bamf-%{version}
%build
%{__gtkdocize}
@@ -169,56 +130,26 @@ demona bamf i dane pomocnicze.
%{__autoconf}
%{__autoheader}
%{__automake}
-#CFLAGS="%{rpmcflags} -Wno-error=deprecated-declarations"
-
-%define configuredir ..
-
-%if %{with gtk2}
-install -d build-gtk2
-cd build-gtk2
%configure \
--disable-silent-rules \
- --disable-webapps \
- --with-gtk=2 \
--with-html-dir=%{_gtkdocdir} \
+ %{?with_dbusmenu:--enable-actions-menu} \
--enable-gtk-doc
-%{__make}
-cd ..
-%endif
-
-%if %{with gtk3}
-install -d build-gtk3
-cd build-gtk3
-# disable introspection: same gir version as gtk2 (fixed in 0.4.0)
-%configure \
- --disable-introspection \
- --disable-silent-rules \
- --disable-webapps \
- --with-gtk=3 \
-%if %{without gtk2}
- --with-html-dir=%{_gtkdocdir} \
- --enable-gtk-doc
-%endif
%{__make}
-%endif
%install
rm -rf $RPM_BUILD_ROOT
-%if %{with gtk2}
-%{__make} install -C build-gtk2 \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libbamf.la
-%endif
-
-%if %{with gtk3}
-%{__make} install -C build-gtk3 \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libbamf3.la
-%endif
+# resolve conflict with gtk+2 based bamf
+%{__mv} $RPM_BUILD_ROOT%{_gtkdocdir}/{libbamf,libbamf3}
+# upstart is dead
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/upstart
%clean
rm -rf $RPM_BUILD_ROOT
@@ -226,50 +157,34 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post -n bamf3 -p /sbin/ldconfig
-%postun -n bamf3 -p /sbin/ldconfig
-
-%if %{with gtk2}
%files
%defattr(644,root,root,755)
%doc TODO
-%attr(755,root,root) %{_libdir}/libbamf.so.*.*.*
-%ghost %{_libdir}/libbamf.so.0
-%{_libdir}/girepository-1.0/Bamf-0.2.typelib
-
-%files devel
-%defattr(644,root,root,755)
-%{_libdir}/libbamf.so
-%{_includedir}/libbamf
-%{_pkgconfigdir}/libbamf.pc
-%{_datadir}/gir-1.0/Bamf-0.2.gir
-
-%files -n vala-libbamf
-%defattr(644,root,root,755)
-%{_datadir}/vala/vapi/libbamf.vapi
-%endif
-
-%if %{with gtk3}
-%files -n bamf3
-%defattr(644,root,root,755)
-%doc TODO
%attr(755,root,root) %{_libdir}/libbamf3.so.*.*.*
-%ghost %{_libdir}/libbamf3.so.0
+%ghost %{_libdir}/libbamf3.so.2
+%{_libdir}/girepository-1.0/Bamf-3.typelib
-%files -n bamf3-devel
+%files devel
%defattr(644,root,root,755)
%{_libdir}/libbamf3.so
%{_includedir}/libbamf3
%{_pkgconfigdir}/libbamf3.pc
-%endif
+%{_datadir}/gir-1.0/Bamf-3.gir
+
+%files -n vala-libbamf3
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libbamf3.vapi
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/libbamf
+%{_gtkdocdir}/libbamf3
%endif
%files daemon
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/bamfdaemon
+%dir %{_libexecdir}/bamf
+%attr(755,root,root) %{_libexecdir}/bamf/bamfdaemon
+%attr(755,root,root) %{_libexecdir}/bamf/bamfdaemon-dbus-runner
%{_datadir}/dbus-1/services/org.ayatana.bamf.service
+%{systemduserunitdir}/bamfdaemon.service
diff --git a/bamf-gir.patch b/bamf-gir.patch
deleted file mode 100644
index 740425e..0000000
--- a/bamf-gir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bamf-0.3.6/lib/libbamf/Makefile.am.orig 2013-01-11 17:57:19.981616000 +0100
-+++ bamf-0.3.6/lib/libbamf/Makefile.am 2025-08-30 18:52:30.675802776 +0200
-@@ -130,8 +130,7 @@ introspection_sources = \
- Bamf-0.2.gir: libbamf.la
- Bamf_0_2_gir_INCLUDES = GObject-2.0 GLib-2.0
- Bamf_0_2_gir_CFLAGS = \
-- --warn-all \
-- --c-include='libbamf/libbamf.h' \
-+ -include 'libbamf/libbamf.h' \
- $(DBUS_CFLAGS) \
- -I$(top_srcdir)/lib \
- -I$(top_builddir)/lib \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bamf3.git/commitdiff/14f34753c73af785a1103ea1c13d63a859b79493
More information about the pld-cvs-commit
mailing list