[i3] 4.1.2

[Tom Callaway]

commit c94b7bacf9ba753d9e7dc20c385ee636cf98346e
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Apr 12 12:09:40 2012 -0400

    4.1.2

 fedora-i3-4.1.2-common.mk |   72 +++++++++++++++++++++++++++++++++++++++++++++
 i3.spec                   |   13 +++++--
 sources                   |    2 +-
 3 files changed, 82 insertions(+), 5 deletions(-)
---
diff --git a/fedora-i3-4.1.2-common.mk b/fedora-i3-4.1.2-common.mk
new file mode 100644
index 0000000..b6c15ed
--- /dev/null
+++ b/fedora-i3-4.1.2-common.mk
@@ -0,0 +1,72 @@
+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)
+CFLAGS += $(call cflags_for_lib, libpcre,pcre)
+CFLAGS += $(call cflags_for_lib, libstartup-notification-1.0)
+CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
+CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
+CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
+
+LIBS += -lm
+LIBS += -L $(TOPDIR)/libi3 -li3
+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)
+LIBS += $(call ldflags_for_lib, libpcre,pcre)
+LIBS += $(call ldflags_for_lib, libstartup-notification-1.0)
+
+# 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 a1d8d51..6bffbb6 100644
--- a/i3.spec
+++ b/i3.spec
@@ -1,6 +1,6 @@
 Name:           i3
-Version:        4.0.1
-Release:        3%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        Improved tiling window manager
 Group:          User Interface/Desktops
 License:        BSD
@@ -9,6 +9,8 @@ Source0:        http://i3wm.org/downloads/%{name}-%{version}.tar.bz2
 Source1:        %{name}-logo.svg
 Source2:        fedora-%{name}-%{version}-common.mk
 
+BuildRequires:	xcb-util-keysyms-devel
+BuildRequires:	xcb-util-wm-devel
 BuildRequires:  xcb-util-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  xcb-proto
@@ -16,7 +18,9 @@ BuildRequires:  libev-devel
 BuildRequires:  libxkbfile-devel
 BuildRequires:  libXcursor-devel
 BuildRequires:  libX11-devel
+BuildRequires:	startup-notification-devel
 BuildRequires:  yajl-devel
+BuildRequires:	pcre-devel
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  asciidoc
@@ -92,7 +96,6 @@ install -Dpm0644 %{SOURCE1} \
 
 
 %files
-%defattr(-,root,root,-)
 %doc GOALS LICENSE RELEASE-NOTES-%{version}
 %{_bindir}/%{name}*
 %{_includedir}/%{name}/*
@@ -106,11 +109,13 @@ install -Dpm0644 %{SOURCE1} \
 
 
 %files doc
-%defattr(-,root,root,-)
 %doc docs/*.{html,png} pseudo-doc/doxygen/
 
 
 %changelog
+* Mon Mar 26 2012 Tom Callaway <spot at fedoraproject.org> - 4.1.2-1
+- update to 4.1.2
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 95030e6..a594c2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87c5961589068269da611b79064c628e  i3-4.0.1.tar.bz2
+0e81c381f9bf3ebf155aaa394e71834f  i3-4.1.2.tar.bz2