[awesome] Update to 3.5.3.
Thomas Moschny
thm at fedoraproject.org
Wed Apr 2 16:37:05 UTC 2014
commit f05d834d5e75d3c4dded69198ffcb7bb5f7ee5e7
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Fri Mar 21 21:49:50 2014 +0100
Update to 3.5.3.
- Remove dependency on libev, and a related patch.
- Remove dependency on xcb-image.
- Add dependency on xcb-cursor.
- Simplify cmake invocation.
.gitignore | 1 +
awesome-3.4-libev-pkg-config.patch | 11 -------
....5.1-lua-52.patch => awesome-3.5.3-lua-52.patch | 8 ++--
...h => awesome-3.5.3-use-vi-instead-of-nano.patch | 12 ++-----
awesome.spec | 32 +++++++++----------
sources | 2 +-
6 files changed, 25 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd93f3d..dc454fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/awesome-3.4.14.tar.xz
/awesome-3.4.15.tar.xz
/awesome-3.5.1.tar.xz
+/awesome-3.5.3.tar.xz
diff --git a/awesome-3.5.1-lua-52.patch b/awesome-3.5.3-lua-52.patch
similarity index 63%
rename from awesome-3.5.1-lua-52.patch
rename to awesome-3.5.3-lua-52.patch
index 6fe94cb..01a10b5 100644
--- a/awesome-3.5.1-lua-52.patch
+++ b/awesome-3.5.3-lua-52.patch
@@ -1,7 +1,7 @@
-diff -up awesome-3.5.1/awesomeConfig.cmake.lua-52 awesome-3.5.1/awesomeConfig.cmake
---- awesome-3.5.1/awesomeConfig.cmake.lua-52 2013-05-13 09:59:41.739295007 -0400
-+++ awesome-3.5.1/awesomeConfig.cmake 2013-05-13 10:00:40.121295883 -0400
-@@ -61,8 +61,8 @@ a_find_program(CONVERT_EXECUTABLE conver
+diff -up awesome-3.5.3/awesomeConfig.cmake.lua-52 awesome-3.5.3/awesomeConfig.cmake
+--- awesome-3.5.3/awesomeConfig.cmake.lua-52 2014-03-29 18:17:20.000000000 +0100
++++ awesome-3.5.3/awesomeConfig.cmake 2014-04-02 18:14:57.232099602 +0200
+@@ -64,8 +64,8 @@ a_find_program(CONVERT_EXECUTABLE conver
include(FindDoxygen)
# pkg-config
include(FindPkgConfig)
diff --git a/awesome-3.5.1-use-vi-instead-of-nano.patch b/awesome-3.5.3-use-vi-instead-of-nano.patch
similarity index 65%
rename from awesome-3.5.1-use-vi-instead-of-nano.patch
rename to awesome-3.5.3-use-vi-instead-of-nano.patch
index 3e0a4b2..bfd7ae2 100644
--- a/awesome-3.5.1-use-vi-instead-of-nano.patch
+++ b/awesome-3.5.3-use-vi-instead-of-nano.patch
@@ -9,11 +9,10 @@ The default text editor in Fedora is vi.
awesomerc.lua.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/awesomerc.lua.in b/awesomerc.lua.in
-index 54c42fb..d1dc796 100644
---- a/awesomerc.lua.in
-+++ b/awesomerc.lua.in
-@@ -42,7 +42,7 @@ beautiful.init("@AWESOME_THEMES_PATH@/default/theme.lua")
+diff -up awesome-3.5.3/awesomerc.lua.in.use-vi-instead-of-nano awesome-3.5.3/awesomerc.lua.in
+--- awesome-3.5.3/awesomerc.lua.in.use-vi-instead-of-nano 2014-03-29 18:17:20.000000000 +0100
++++ awesome-3.5.3/awesomerc.lua.in 2014-04-02 18:12:13.652025715 +0200
+@@ -42,7 +42,7 @@ beautiful.init("@AWESOME_THEMES_PATH@/de
-- This is used later as the default terminal and editor to run.
terminal = "xterm"
@@ -22,6 +21,3 @@ index 54c42fb..d1dc796 100644
editor_cmd = terminal .. " -e " .. editor
-- Default modkey.
---
-1.8.1.4
-
diff --git a/awesome.spec b/awesome.spec
index 29dd446..46ed207 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,15 +1,14 @@
Name: awesome
-Version: 3.5.1
-Release: 8%{?dist}
+Version: 3.5.3
+Release: 1%{?dist}
Summary: Highly configurable, framework window manager for X. Fast, light and extensible
Group: User Interface/Desktops
# common/buffer.[ch]: BSD
License: GPLv2+ and BSD
URL: http://awesome.naquadah.org
Source0: http://awesome.naquadah.org/download/%{name}-%{version}.tar.xz
-Patch0: awesome-3.4-libev-pkg-config.patch
-Patch1: awesome-3.5.1-lua-52.patch
-Patch2: awesome-3.5.1-use-vi-instead-of-nano.patch
+Patch0: awesome-3.5.3-lua-52.patch
+Patch1: awesome-3.5.3-use-vi-instead-of-nano.patch
BuildRequires: cmake >= 2.8.0
@@ -23,12 +22,8 @@ BuildRequires: xmlto
BuildRequires: pkgconfig(xcb) >= 1.6
BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libev)
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(cairo)
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(x11-xcb)
-BuildRequires: pkgconfig(xcursor)
BuildRequires: pkgconfig(xcb-randr)
BuildRequires: pkgconfig(xcb-xtest)
BuildRequires: pkgconfig(xcb-xinerama)
@@ -36,7 +31,7 @@ BuildRequires: pkgconfig(xcb-shape)
BuildRequires: pkgconfig(xcb-util) >= 0.3.8
BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4
BuildRequires: pkgconfig(xcb-icccm) >= 0.3.8
-BuildRequires: pkgconfig(xcb-image) >= 0.3.0
+BuildRequires: pkgconfig(xcb-cursor)
BuildRequires: pkgconfig(cairo-xcb)
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.10
BuildRequires: pkgconfig(xproto) >= 7.0.15
@@ -84,18 +79,14 @@ API doc files for awesome generated by luadoc.
%prep
%setup -q
-# Fedora specific patch - we provide pkgconfig support for libev
-# so we also provide it's usage in awesome
-%patch0 -p1
-%patch1 -p1 -b .lua-52
-%patch2 -p1
+%patch0 -p1 -b .lua-52
+%patch1 -p1 -b .use-vi-instead-of-nano
%build
mkdir build; pushd build
%cmake -DAWESOME_DOC_PATH=%{_pkgdocdir} \
- -DXDG_CONFIG_DIR=%{_sysconfdir}/xdg \
- -DLDOC_EXECUTABLE=%{_bindir}/ldoc \
+ -DSYSCONFDIR=%{_sysconfdir} \
..
popd
make -C build VERBOSE=1 %{?_smp_mflags} awesome
@@ -129,6 +120,13 @@ desktop-file-validate %{buildroot}%{_datadir}/xsessions/%{name}.desktop
%changelog
+* Wed Apr 2 2014 Thomas Moschny <thomas.moschny at gmx.de> - 3.5.3-1
+- Update to 3.5.3.
+- Remove dependency on libev, and a related patch.
+- Remove dependency on xcb-image.
+- Add dependency on xcb-cursor.
+- Simplify cmake invocation.
+
* Sun Aug 18 2013 Thomas Moschny <thomas.moschny at gmx.de> - 3.5.1-8
- Define (if undefined) and use _pkgdocdir macro (rhbz#993678).
- Fix bogus dates in the %%changelog.
diff --git a/sources b/sources
index ee8ed4c..4b5fec5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f528f66ddcdb07f24e6f494837371702 awesome-3.5.1.tar.xz
+730a5852cc61f5561588a1b788ec861e awesome-3.5.3.tar.xz
More information about the scm-commits
mailing list