up to 4.14.1

- uses autotools now
- package man pages and docs
- updated BRs

diff --git a/i3.spec b/i3.spec
index 89e7d65bb2feac10cc9844349a539f9b44e44d5e..f51fb54cc2a515ea63d35cdcfeab5501b95a0ff2 100644 (file)
--- a/i3.spec
+++ b/i3.spec
@@ -1,13 +1,15 @@
 Summary:       improved tiling wm
 Name:          i3
-Version:       4.6
+Version:       4.14.1
 Release:       0.1
 License:       BSD
 Group:         X11/Window Managers
 Source0:       http://i3wm.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 11901176eea90632384434c371840cfd
+# Source0-md5: 0f4eec9e5a9f7be060bda41206b13f87
 URL:           http://i3wm.org/
 BuildRequires: asciidoc
+BuildRequires: autoconf >= 2.69
+BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libev-devel
@@ -17,12 +19,16 @@ BuildRequires:      pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: startup-notification-devel
 BuildRequires: xcb-proto
+BuildRequires: xcb-util-cursor-devel
 BuildRequires: xcb-util-devel
 BuildRequires: xcb-util-keysyms-devel
 BuildRequires: xcb-util-wm-devel
+BuildRequires: xcb-util-xrm-devel
 BuildRequires: xmlto
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXcursor-devel
+BuildRequires: xorg-lib-libxkbcommon-devel
+BuildRequires: xorg-lib-libxkbcommon-x11-devel
 BuildRequires: xorg-lib-libxkbfile
 BuildRequires: yajl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,23 +50,28 @@ Header files for %{name}.
 %setup -q
 
 %build
-%{__make} V=1 \
-       CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} -freorder-blocks-and-partition" \
-       LDFLAGS="%{rpmldflags}"
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --disable-builddir \
+       --disable-silent-rules
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-       INSTALL="install -p" \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -r $RPM_BUILD_ROOT%{_docdir}/i3
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE RELEASE-NOTES-%{version}
+%doc LICENSE RELEASE-NOTES-%{version} docs/*.html
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/config
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/config.keycodes
@@ -73,11 +84,27 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/i3-migrate-config-to-v4
 %attr(755,root,root) %{_bindir}/i3-msg
 %attr(755,root,root) %{_bindir}/i3-nagbar
+%attr(755,root,root) %{_bindir}/i3-save-tree
 %attr(755,root,root) %{_bindir}/i3-sensible-editor
 %attr(755,root,root) %{_bindir}/i3-sensible-pager
 %attr(755,root,root) %{_bindir}/i3-sensible-terminal
+%attr(755,root,root) %{_bindir}/i3-with-shmlog
 %{_datadir}/xsessions/%{name}.desktop
 %{_desktopdir}/%{name}.desktop
+%{_mandir}/man1/i3.1*
+%{_mandir}/man1/i3bar.1*
+%{_mandir}/man1/i3-config-wizard.1*
+%{_mandir}/man1/i3-dmenu-desktop.1*
+%{_mandir}/man1/i3-dump-log.1*
+%{_mandir}/man1/i3-input.1*
+%{_mandir}/man1/i3-migrate-config-to-v4.1*
+%{_mandir}/man1/i3-msg.1*
+%{_mandir}/man1/i3-nagbar.1*
+%{_mandir}/man1/i3-save-tree.1*
+%{_mandir}/man1/i3-sensible-editor.1*
+%{_mandir}/man1/i3-sensible-pager.1*
+%{_mandir}/man1/i3-sensible-terminal.1*
+%{_datadir}/xsessions/i3-with-shmlog.desktop
 
 %files devel
 %defattr(644,root,root,755)