[i3/el6] New upstream release

Sat Aug 6 18:41:14 UTC 2011

commit 1097a9d870eb2e9c772414152ebf23e82da1212b
Author: Simon Wesp <cassmodiah at fedoraproject.org>
Date:   Sat Aug 6 20:40:51 2011 +0200

    New upstream release

 .gitignore                |    1 +
 fedora-i3-4.0.1-common.mk |   67 +++++++++++++++++++++++++++++++++++++++++++++
 i3.spec                   |   46 +++++++++++++++++++-----------
 sources                   |    2 +-
 4 files changed, 98 insertions(+), 18 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 550fefa..07a11ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 i3-3.e-bf1.tar.bz2
+/i3-4.0.1.tar.bz2
diff --git a/fedora-i3-4.0.1-common.mk b/fedora-i3-4.0.1-common.mk
new file mode 100644
index 0000000..bcd0f57
--- /dev/null
+++ b/fedora-i3-4.0.1-common.mk
@@ -0,0 +1,67 @@
+INSTALL=install -p
+PREFIX=PUTINPREFIXHERE
+SYSCONFDIR=PUTINSYSCONFDIRHERE
+TERM_EMU=xterm
+GIT_VERSION:=4.0.1
+VERSION:=4.0.1
+cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1))
+ldflags_for_lib = $(shell pkg-config --exists $(1) && pkg-config --libs $(1) || echo -l$(2))
+
+CFLAGS += PUTINOPTFLAGSHERE -std=c99 -std=gnu99
+CFLAGS += -IPUTININCLUDEDIRHERE
+CFLAGS += -IPUTININCLUDEDIRHERE/libev
+#CFLAGS += -Wunused-result
+#CFLAGS += -Wunused-value
+CFLAGS += -Iinclude
+CFLAGS += $(call cflags_for_lib, xcb-keysyms)
+ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
+CPPFLAGS += -DXCB_COMPAT
+CFLAGS += $(call cflags_for_lib, xcb-atom)
+CFLAGS += $(call cflags_for_lib, xcb-aux)
+else
+CFLAGS += $(call cflags_for_lib, xcb-util)
+endif
+CFLAGS += $(call cflags_for_lib, xcb-icccm)
+CFLAGS += $(call cflags_for_lib, xcb-xinerama)
+CFLAGS += $(call cflags_for_lib, xcb-randr)
+CFLAGS += $(call cflags_for_lib, xcb)
+CFLAGS += $(call cflags_for_lib, xcursor)
+CFLAGS += $(call cflags_for_lib, x11)
+CFLAGS += $(call cflags_for_lib, yajl)
+CFLAGS += $(call cflags_for_lib, libev)
+CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
+CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
+CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
+
+LIBS += -lm
+LIBS += $(call ldflags_for_lib, xcb-event, xcb-event)
+LIBS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
+ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
+LIBS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
+LIBS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
+else
+LIBS += $(call ldflags_for_lib, xcb-util)
+endif
+LIBS += $(call ldflags_for_lib, xcb-icccm, xcb-icccm)
+LIBS += $(call ldflags_for_lib, xcb-xinerama, xcb-xinerama)
+LIBS += $(call ldflags_for_lib, xcb-randr, xcb-randr)
+LIBS += $(call ldflags_for_lib, xcb, xcb)
+LIBS += $(call ldflags_for_lib, xcursor, Xcursor)
+LIBS += $(call ldflags_for_lib, x11, X11)
+LIBS += $(call ldflags_for_lib, yajl, yajl)
+LIBS += $(call ldflags_for_lib, libev, ev)
+
+# Please test if -Wl,--as-needed works on your platform and send me a patch.
+# it is known not to work on Darwin (Mac OS X)
+#ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
+#LDFLAGS += -Wl,--as-needed
+#endif
+
+CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
+
+#ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
+#CPPFLAGS += -D_GNU_SOURCE
+#endif
+
+.PHONY: install clean dist distclean
+
diff --git a/i3.spec b/i3.spec
index ace0eae..d7be0b6 100644
--- a/i3.spec
+++ b/i3.spec
@@ -1,15 +1,13 @@
-%global ipc-version 0.1.3
-%global upstream_version 3.e-bf2
- 
 Name:           i3
-Version:        3.e
-Release:        6.bf2%{?dist}
+Version:        4.0.1
+Release:        1%{?dist}
 Summary:        Improved tiling window manager
 Group:          User Interface/Desktops
 License:        BSD
-URL:            http://i3.zekjur.net
-Source0:        http://i3.zekjur.net/downloads/%{name}-%{upstream_version}.tar.bz2
+URL:            http://i3wm.org
+Source0:        http://i3wm.org/downloads/%{name}-%{version}.tar.bz2
 Source1:        %{name}-logo.svg
+Source2:        fedora-%{name}-%{version}-common.mk
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,11 +16,13 @@ BuildRequires:  libxcb-devel
 BuildRequires:  xcb-proto
 BuildRequires:  libev-devel
 BuildRequires:  libxkbfile-devel
+BuildRequires:  libXcursor-devel
 BuildRequires:  libX11-devel
 BuildRequires:  yajl-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  asciidoc
+
 Requires:       rxvt-unicode
 Requires:       xorg-x11-apps
 Requires:       dmenu
@@ -52,15 +52,20 @@ Asciidoc and doxygen generated documentations for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
+
+cp %{SOURCE2} %{_builddir}/%{name}-%{version}/
 
 sed \
-    -e 's|CFLAGS += -Wall|CFLAGS += %{optflags}|g' \
-    -e 's|CFLAGS += -pipe|CFLAGS += -I/usr/include/libev |g' \
-    -e 's|CFLAGS += -I/usr/local/include|CFLAGS += -I%{_includedir}|g' \
-    -e 's|/usr/local/lib|%{_libdir}|g' \
-    -e 's|.SILENT:||g' \
-    -i common.mk
+    -e 's|include $(TOPDIR)/common.mk|include $(TOPDIR)/fedora-%{name}-%{version}-common.mk|g' \
+    -i Makefile
+
+sed \
+    -e 's|PUTINOPTFLAGSHERE|%{optflags}|g' \
+    -e 's|PUTININCLUDEDIRHERE|%{_includedir}|g' \
+    -e 's|PUTINPREFIXHERE|%{_prefix}|g' \
+    -e 's|PUTINSYSCONFDIRHERE|%{_sysconfdir}|g' \
+    -i fedora-%{name}-%{version}-common.mk
 
 
 %build
@@ -95,12 +100,13 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc GOALS LICENSE RELEASE-NOTES-%{upstream_version}
+%doc GOALS LICENSE RELEASE-NOTES-%{version}
 %{_bindir}/%{name}*
 %{_includedir}/%{name}/*
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/%{name}/config
 %config(noreplace) %{_sysconfdir}/%{name}/welcome
+%config(noreplace) %{_sysconfdir}/%{name}/config.keycodes
 %{_datadir}/xsessions/%{name}.desktop
 %{_mandir}/man*/%{name}*
 %{_datadir}/pixmaps/%{name}-logo.svg
@@ -112,8 +118,14 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Jul 21 2011 Simon Wesp <cassmodiah at fedoraproject.org> - 3.e-6.bf2
-- rebuild against newest libev
+* Mon Aug 01 2011 Simon Wesp <cassmodiah at fedoraproject.org> - 4.0.1-1
+- New upstream release
+
+* Sun Jul 31 2011 Simon Wesp <cassmodiah at fedoraproject.org> -4.0-1
+- New upstream release
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.e-6.bf2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Sat Jan 19 2011 Simon Wesp <cassmodiah at fedoraproject.org> - 3.e-5.bf2
 - New upstream release
diff --git a/sources b/sources
index 38e7073..95030e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc2c59623fdc9e69003b8807a0443544  i3-3.e-bf2.tar.bz2
+87c5961589068269da611b79064c628e  i3-4.0.1.tar.bz2
