[awesome/f19] Update to 3.5.3.
Thomas Moschny
thm at fedoraproject.org
Wed Apr 2 17:52:16 UTC 2014
commit 43b71eb6686cfeee487d326b6a2ca58a30c67ddf
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Wed Apr 2 19:39:02 2014 +0200
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.
- Define (if undefined) and use _pkgdocdir macro (rhbz#993678).
- Fix bogus dates in the %changelog.
.gitignore | 1 +
awesome-3.4-libev-pkg-config.patch | 11 ----
...h => awesome-3.5.3-use-vi-instead-of-nano.patch | 12 ++---
awesome.spec | 57 ++++++++++---------
sources | 2 +-
5 files changed, 36 insertions(+), 47 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-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 59f75d1..f6a6bfc 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,14 +1,13 @@
Name: awesome
-Version: 3.5.1
-Release: 4%{?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
-Patch2: awesome-3.5.1-use-vi-instead-of-nano.patch
+Patch1: awesome-3.5.3-use-vi-instead-of-nano.patch
BuildRequires: cmake >= 2.8.0
@@ -22,12 +21,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)
@@ -35,7 +30,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
@@ -59,6 +54,8 @@ Requires: rlwrap
# default editor
Requires: vi
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
%description
Awesome is a highly configurable, next generation framework window
@@ -72,6 +69,7 @@ control on its graphical environment.
%package doc
Summary: API doc files
Group: Documentation
+BuildArch: noarch
Requires: %{name} = %{version}-%{release}
%description doc
@@ -80,16 +78,13 @@ 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
-%patch2 -p1
+%patch1 -p1 -b .use-vi-instead-of-nano
+
%build
mkdir build; pushd build
-%cmake -DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} \
- -DXDG_CONFIG_DIR=%{_sysconfdir}/xdg \
- -DLDOC_EXECUTABLE=%{_bindir}/ldoc \
+%cmake -DAWESOME_DOC_PATH=%{_pkgdocdir} \
+ -DSYSCONFDIR=%{_sysconfdir} \
..
popd
make -C build VERBOSE=1 %{?_smp_mflags} awesome
@@ -101,13 +96,11 @@ make -C build DESTDIR="%{buildroot}" INSTALL="install -p" install
# verify desktop file
desktop-file-validate %{buildroot}%{_datadir}/xsessions/%{name}.desktop
-# move HTML docs
-mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
- %{buildroot}%{_docdir}/%{name}
-
%files
-%doc %{_docdir}/%{name}-%{version}/*
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/doc
%dir %{_sysconfdir}/xdg/%{name}
%config(noreplace) %{_sysconfdir}/xdg/%{name}/rc.lua
%{_bindir}/awesome
@@ -120,10 +113,20 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
%files doc
-%doc %{_docdir}/%{name}
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/doc
%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.
+- Define (if undefined) and use _pkgdocdir macro (rhbz#993678).
+- Fix bogus dates in the %%changelog.
+
* Tue May 28 2013 Thomas Moschny <thomas.moschny at gmx.de> - 3.5.1-4
- Remove obsolete BR on gperf.
- Add vi as explicit requirement.
@@ -268,7 +271,7 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
* Tue May 19 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.3.rc3
- 3.3-rc3
-* Thu May 13 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.2.rc2
+* Wed May 13 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.2.rc2
- 3.3-rc2
* Thu May 7 2009 Michal Nowak <mnowak at redhat.com> 3.3-0.1.rc1
@@ -321,7 +324,7 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
- new dep: xsri
- %%{_datadir}/%%{name}/themes/default is now handled configfile
-* Thu Aug 15 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.3.rc3
+* Fri Aug 15 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.3.rc3
- bump to RC3
- xsession desktop file is now provided by upstream
- dumped patches
@@ -330,13 +333,13 @@ mv %{buildroot}%{_docdir}/%{name}-%{version}/doc \
both are now in upstream
- cmake is now need >2.6 (present in rawhide)
-* Thu Aug 11 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.2.rc2
+* Mon Aug 11 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.2.rc2
- bump to RC2
-* Thu Aug 04 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.1.rc1
+* Mon Aug 04 2008 Michal Nowak <mnowak at redhat.com> 3.0-0.1.rc1
- bump to awesome v3-the new generation
-* Thu Jul 28 2008 Michal Nowak <mnowak at redhat.com> 2.3.3-1
+* Mon Jul 28 2008 Michal Nowak <mnowak at redhat.com> 2.3.3-1
- version bump fixes two bugs
- give floating dialogs of maximized windows focus
- awesomerc: fix xterm -e in case of others terms
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