[awesome] Update to 3.5.1.

Thomas Moschny thm at fedoraproject.org
Thu Apr 4 17:04:09 UTC 2013 

commit 4be59cb74f4184562886502e3e3abd8fbd416b84
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Apr 4 18:54:26 2013 +0200

    Update to 3.5.1.
    
    - Rework BR section:
      - Replace imlib2 with gdk-pixbuf-2.0.
      - Replace luadoc with lua-ldoc.
      - Add lua-lgi.

 .gitignore                          |    1 +
 awesome-3.4-desktop-nodisplay.patch |   12 ------
 awesome-3.4-libev-pkg-config.patch  |   11 ++---
 awesome.spec                        |   74 +++++++++++++++++++++--------------
 sources                             |    2 +-
 5 files changed, 51 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3508b8a..bd93f3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /awesome-3.4.13.tar.xz
 /awesome-3.4.14.tar.xz
 /awesome-3.4.15.tar.xz
+/awesome-3.5.1.tar.xz
diff --git a/awesome-3.4-libev-pkg-config.patch b/awesome-3.4-libev-pkg-config.patch
index 4037d3d..81b372d 100644
--- a/awesome-3.4-libev-pkg-config.patch
+++ b/awesome-3.4-libev-pkg-config.patch
@@ -1,12 +1,11 @@
-diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
-index d2aad1c..5fe005c 100644
---- a/awesomeConfig.cmake
-+++ b/awesomeConfig.cmake
-@@ -131,6 +131,7 @@ pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
+diff -up awesome-3.5.1/awesomeConfig.cmake~ awesome-3.5.1/awesomeConfig.cmake
+--- awesome-3.5.1/awesomeConfig.cmake~	2013-04-01 13:44:46.000000000 +0200
++++ awesome-3.5.1/awesomeConfig.cmake	2013-04-03 20:06:05.560633589 +0200
+@@ -130,6 +130,7 @@ pkg_check_modules(AWESOME_COMMON_REQUIRE
  
  pkg_check_modules(AWESOME_REQUIRED REQUIRED
      glib-2.0
 +    libev
+     gdk-pixbuf-2.0
      cairo
      x11
-     x11-xcb
diff --git a/awesome.spec b/awesome.spec
index d94007c..f599896 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -1,5 +1,5 @@
 Name:		awesome
-Version:	3.4.15
+Version:	3.5.1
 Release:	1%{?dist}
 Summary:	Highly configurable, framework window manager for X. Fast, light and extensible
 Group:		User Interface/Desktops
@@ -8,7 +8,6 @@ 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.4-desktop-nodisplay.patch
 
 BuildRequires:	cmake >= 2.8.0
 
@@ -18,31 +17,36 @@ BuildRequires:	doxygen
 BuildRequires:	gperf
 BuildRequires:	graphviz
 BuildRequires:	lua-devel
-BuildRequires:	luadoc
+BuildRequires:	lua-ldoc
 BuildRequires:	xmlto
+
 BuildRequires:	pkgconfig(xcb) >= 1.6
-BuildRequires:	pkgconfig(xcb-icccm) >= 0.3.8
-BuildRequires:	pkgconfig(xcb-util) >= 0.3.8
-BuildRequires:	pkgconfig(cairo)
-BuildRequires:	pkgconfig(cairo-xcb)
-BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(glib-2.0)
-BuildRequires:	pkgconfig(imlib2)
-BuildRequires:	pkgconfig(libstartup-notification-1.0) >= 0.10
-BuildRequires:	pkgconfig(libxdg-basedir) >= 1.0.0
-BuildRequires:	pkgconfig(pango) >= 1.19.3
-BuildRequires:	pkgconfig(pangocairo) >= 1.19.3
+BuildRequires:	pkgconfig(libev)
+BuildRequires:	pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:	pkgconfig(cairo)
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(x11-xcb)
-BuildRequires:	pkgconfig(xcb-image) >= 0.3.0
-BuildRequires:	pkgconfig(xcb-keysyms) >= 0.3.4
+BuildRequires:	pkgconfig(xcursor)
 BuildRequires:	pkgconfig(xcb-randr)
-BuildRequires:	pkgconfig(xcb-shape)
-BuildRequires:	pkgconfig(xcb-xinerama)
 BuildRequires:	pkgconfig(xcb-xtest)
+BuildRequires:	pkgconfig(xcb-xinerama)
+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(cairo-xcb)
+BuildRequires:	pkgconfig(libstartup-notification-1.0) >= 0.10
 BuildRequires:	pkgconfig(xproto) >= 7.0.15
-BuildRequires:	pkgconfig(xcursor)
-BuildRequires:	pkgconfig(libev)
+BuildRequires:	pkgconfig(libxdg-basedir) >= 1.0.0
+BuildRequires:	pkgconfig(dbus-1)
+
+BuildRequires:	lua-lgi
+BuildRequires:	pkgconfig(pango) >= 1.19.3
+BuildRequires:	pkgconfig(pangocairo) >= 1.19.3
+Requires:	pango >= 1.19.3
+
 BuildRequires:	desktop-file-utils
 Requires:	startup-notification >= 0.10
 # terminal used in the default configuration
@@ -74,31 +78,34 @@ API doc files for awesome generated by luadoc.
 # Fedora specific patch - we provide pkgconfig support for libev
 # so we also provide it's usage in awesome
 %patch0 -p1
-# upstream commit 4bcb4b1 on 3.4 branch, fixes rhbz#901434
-%patch1 -p1
 
 %build
-%cmake -DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} -DXDG_CONFIG_DIR=%{_sysconfdir}/xdg
-make VERBOSE=1 %{?_smp_mflags}
+mkdir build; pushd build
+%cmake -DAWESOME_DOC_PATH=%{_docdir}/%{name}-%{version} \
+       -DXDG_CONFIG_DIR=%{_sysconfdir}/xdg \
+       -DLDOC_EXECUTABLE=%{_bindir}/ldoc \
+       ..
+popd
+make -C build VERBOSE=1 %{?_smp_mflags} awesome
 
 
 %install
-make DESTDIR="%{buildroot}" INSTALL="install -p" install 
-
-# fix permissions of generated docs
-chmod -R u=rwX,go=rX luadoc
+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 README BUGS AUTHORS LICENSE PATCHES STYLE
+%doc %{_docdir}/%{name}-%{version}/*
 %dir %{_sysconfdir}/xdg/%{name}
 %config(noreplace) %{_sysconfdir}/xdg/%{name}/rc.lua
 %{_bindir}/awesome
 %{_bindir}/awesome-client
-%{_bindir}/awsetbg
 %{_datadir}/%{name}
 %{_mandir}/man?/*
 %{_mandir}/*/man1/*
@@ -107,10 +114,17 @@ desktop-file-validate %{buildroot}%{_datadir}/xsessions/%{name}.desktop
 
 
 %files doc
-%doc luadoc/*
+%doc %{_docdir}/%{name}
 
 
 %changelog
+* Wed Apr  3 2013 Thomas Moschny <thomas.moschny at gmx.de> - 3.5.1-1
+- Update to 3.5.1.
+- Rework BR section:
+  - Replace imlib2 with gdk-pixbuf-2.0.
+  - Replace luadoc with lua-ldoc.
+  - Add lua-lgi.
+
 * Sat Mar 16 2013 Thomas Moschny <thomas.moschny at gmx.de> - 3.4.15-1
 - Update to 3.4.15.
 - Add patch from upstream to fix rhbz#901434.
diff --git a/sources b/sources
index 34bbad5..ee8ed4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e3a14bed1e6a0d424fc79aba03d981e  awesome-3.4.15.tar.xz
+f528f66ddcdb07f24e6f494837371702  awesome-3.5.1.tar.xz

More information about the scm-commits mailing list