commit 351d638d659bd3e4d6b105682ae262cbb0fa8cb7
Author: Jakub Bogusz <[email protected]>
Date: Sun Jan 27 20:53:45 2019 +0100
- updated URLs, completed dependencies
- added link patch (binary needs -lm)
- release 4
matchbox-window-manager-link.patch | 11 +++++++++++
matchbox-window-manager.spec | 24 +++++++++++++++++++-----
2 files changed, 30 insertions(+), 5 deletions(-)
---
diff --git a/matchbox-window-manager.spec b/matchbox-window-manager.spec
index 0e54ea8..dde2f59 100644
--- a/matchbox-window-manager.spec
+++ b/matchbox-window-manager.spec
@@ -2,27 +2,34 @@
# Conditional build:
%bcond_without gconf # gconf support
%bcond_without session # session manager support
-%bcond_without sn # startup-notification support
+%bcond_without sn # startup-notification support
%bcond_without composite # composite support (experimental)
#
Summary: Matchbox Window Manager
Summary(pl.UTF-8): Zarządca okien dla środowiska Matchbox
Name: matchbox-window-manager
Version: 1.2
-Release: 3
+Release: 4
License: GPL v2+
Group: X11/Window Managers
-Source0:
http://matchbox-project.org/sources/matchbox-window-manager/1.2/%{name}-%{version}.tar.bz2
+Source0:
http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/1.2/%{name}-%{version}.tar.bz2
# Source0-md5: 3e158dcf57823b55c926d95b245500fb
-URL: http://www.matchbox-project.org/
+Patch0: %{name}-link.patch
+URL: https://www.yoctoproject.org/software-item/matchbox/
%{?with_gconf:BuildRequires: GConf2-devel >= 2.0}
+BuildRequires: autoconf >= 2.53
+BuildRequires: automake
BuildRequires: expat-devel >= 1.95
BuildRequires: libmatchbox-devel >= 1.5
+BuildRequires: libtool
BuildRequires: pkgconfig
%{?with_sn:BuildRequires: startup-notification-devel}
%{?with_session:BuildRequires: xorg-lib-libSM-devel}
%{?with_composite:BuildRequires: xorg-lib-libXcomposite-devel}
+BuildRequires: xorg-lib-libXcursor-devel
+BuildRequires: xorg-lib-libXfixes-devel >= 4.0
Requires: libmatchbox >= 1.5
+Requires: xorg-lib-libXfixes >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -33,11 +40,18 @@ Zarządca okien dla środowiska Matchbox.
%prep
%setup -q
+%patch0 -p1
%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
%{?with_composite:--enable-composite} \
%{?with_gconf:--enable-gconf} \
+ %{?with_session:--enable-session} \
%{?with_sn:--enable-startup-notification}
%{__make}
@@ -70,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/themes/MBOpus/matchbox
%dir %{_datadir}/themes/blondie
%{_datadir}/themes/blondie/matchbox
-%dir %{_sysconfdir}/matchbox/
+%dir %{_sysconfdir}/matchbox
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/matchbox/kbdconfig
%if %{with gconf}
%{_sysconfdir}/gconf/schemas/matchbox.schemas
diff --git a/matchbox-window-manager-link.patch
b/matchbox-window-manager-link.patch
new file mode 100644
index 0000000..b881567
--- /dev/null
+++ b/matchbox-window-manager-link.patch
@@ -0,0 +1,11 @@
+--- matchbox-window-manager-1.2/src/Makefile.am.orig 2019-01-27
18:56:40.388127148 +0100
++++ matchbox-window-manager-1.2/src/Makefile.am 2019-01-27
19:02:08.668123399 +0100
+@@ -20,7 +20,7 @@
+
+ matchbox_remote_SOURCES = matchbox-remote.c
+
+-matchbox_window_manager_LDADD = $(LIBMB_LIBS) $(COMPO_LIBS) $(EXPAT_LIBS)
$(SN_LIBS) $(GCONF_LIBS) $(XFIXES_LIBS) $(XCURSOR_LIBS)
++matchbox_window_manager_LDADD = $(LIBMB_LIBS) $(COMPO_LIBS) $(EXPAT_LIBS)
$(SN_LIBS) $(GCONF_LIBS) $(XFIXES_LIBS) $(XCURSOR_LIBS) -lm
+
+ matchbox_window_manager_SOURCES = \
+ main.c structs.h wm.c wm.h \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/matchbox-window-manager.git/commitdiff/351d638d659bd3e4d6b105682ae262cbb0fa8cb7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
