Sat Mar 20 18:57:16 UTC 2010

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16809/F-13

Modified Files:
	.cvsignore i3.spec import.log sources 
Removed Files:
	i3-3.d-bf1-1dcb4a39fd676441c30ce5614c2ae6082114837d.patch 
	i3-3.d-bf1-4c87170494cbdd680cb4b128dd60fcdaac995609.patch 
	i3-3.d-bf1-505eaaf3490c21de00e636d012f513f4334ed5c3.patch 
	i3-3.d-bf1-6de212f7eec993346d24af5333ceedfe7849a2f6.patch 
	i3-3.d-bf1-86b0dab7ea8b0252fe30506b08074f4ef4798219.patch 
	i3-3.d-bf1-8adce413f5f92bd8e4c485ee61ff6b8448cd2058.patch 
	i3-3.d-bf1-9dce0818378feefe0aa7844f51f48e03a01607dc.patch 
	i3-3.d-bf1-aaf46bfc55dccf57962ac12d804b6886620c20fc.patch 
	i3-3.d-bf1-d1a0e930a8698deb32d8356bc13403fdd86e2b78.patch 
	i3-3.d-bf1-f399c3ef9d0db8c95113b242e0c69498cf077669.patch 
Log Message:
update to newest git



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- .cvsignore	25 Dec 2009 21:29:16 -0000	1.3
+++ .cvsignore	20 Mar 2010 18:57:16 -0000	1.4
@@ -1 +1 @@
-i3-3.d-bf1.tar.bz2
+i3-3.d-bf1-20100320git.tar.bz2


Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-13/i3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- i3.spec	3 Feb 2010 22:09:16 -0000	1.6
+++ i3.spec	20 Mar 2010 18:57:16 -0000	1.7
@@ -1,38 +1,22 @@
 %global upstream_version 3.d-bf1
+%global git 20100320git
+%global gitversion bbea32f
 
 Name:           i3
 Version:        3.d.bf1
-Release:        4%{?dist}
+Release:        4.%{git}%{?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
+#Source0:        http://i3.zekjur.net/downloads/%{name}-%{upstream_version}.tar.bz2
+# git clone git://code.stapelberg.de/%{name}
+# cd %{name} && git reset --hard %{gitversion} && rm -rf .git .gitingore && cd ..
+# tar -czvf {name}-%{upstream_version}-%{git}.tar.bz2 %{name}
+Source0:        %{name}-%{upstream_version}-%{git}.tar.bz2
 Source1:        %{name}-logo.svg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Fix bindings using the cursor keys in default config
-Patch0: %{name}-%{upstream_version}-6de212f7eec993346d24af5333ceedfe7849a2f6.patch
-# Bugfix: Don’t put dock clients into floating mode (Thanks xeen)
-Patch1: %{name}-%{upstream_version}-9dce0818378feefe0aa7844f51f48e03a01607dc.patch
-# We don’t have DLOG yet in master branch (Thanks ccount)
-Patch2: %{name}-%{upstream_version}-4c87170494cbdd680cb4b128dd60fcdaac995609.patch
-# Remove superfluous #include <assert.h> (Thanks badboy)
-Patch3: %{name}-%{upstream_version}-8adce413f5f92bd8e4c485ee61ff6b8448cd2058.patch
-# Bugfix: Containers could lose their snap state (Thanks Atsutane)
-Patch4: %{name}-%{upstream_version}-505eaaf3490c21de00e636d012f513f4334ed5c3.patch
-# Bugfix: Use ev_loop_new instead of ev_default_loop because the latter one blocks SIGCHLD (Thanks Ciprian)
-Patch5: %{name}-%{upstream_version}-86b0dab7ea8b0252fe30506b08074f4ef4798219.patch
-# Bugfix: if a font provides no per-char info for width, fall back to the default (Thanks Ciprian)
-Patch6: %{name}-%{upstream_version}-d1a0e930a8698deb32d8356bc13403fdd86e2b78.patch
-# Use LOG instead of DLOG (next branch feature only)
-Patch7: %{name}-%{upstream_version}-1dcb4a39fd676441c30ce5614c2ae6082114837d.patch
-# bugfix: lexer: return to INITIAL state (Thanks dirkson)
-Patch8: %{name}-%{upstream_version}-aaf46bfc55dccf57962ac12d804b6886620c20fc.patch
-# Bugfix: Don’t leak IPC socket to launched processes
-Patch9: %{name}-%{upstream_version}-f399c3ef9d0db8c95113b242e0c69498cf077669.patch
-
 BuildRequires:  xcb-util-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  xcb-proto
@@ -72,30 +56,24 @@ Asciidoc and doxygen generated documenta
 
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q -n %{name}
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
-sed -e 's|CFLAGS += -Wunused|CFLAGS += -I/usr/include/libev|g' \
+sed \
+    -e 's|GIT_VERSION:=$(shell git describe --tags --always)|GIT_VERSION:=%{version}-%{git}|g' \
+    -e 's|VERSION:=$(shell git describe --tags --abbrev=0)|VERSION=%{version}-%{git}|g' \
+    -e 's|CFLAGS += -Wunused|CFLAGS += -I/usr/include/libev|g' \
     -e 's|CFLAGS += -Wall|CFLAGS += %{optflags}|g' \
     -e 's|CFLAGS += -pipe|CFLAGS += |g' \
+    -e 's|CFLAGS += -I/usr/local/include|CFLAGS += -I/usr/include|g' \
+    -e 's|.SILENT:||g' \
     -i common.mk
 
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
-cd man; make %{?_smp_mflags}
-cd ../docs; make %{?_smp_mflags}
+cd man; make %{?_smp_mflags} V=1
+cd ../docs; make %{?_smp_mflags} V=1
 
 cd ..
 doxygen pseudo-doc.doxygen
@@ -130,7 +108,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}/config
 %config(noreplace) %{_sysconfdir}/%{name}/welcome
 %{_datadir}/xsessions/%{name}.desktop
-%{_mandir}/man1/%{name}*
+%{_mandir}/man*/%{name}*
 %{_datadir}/pixmaps/%{name}-logo.svg
 
 
@@ -140,31 +118,23 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Mar 20 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-4.20100320git
+- Update to current git
+
 * Wed Feb 03 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-4
 - Some bugfixes (sync with upstream)
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=6de212f7eec993346d24af5333ceedfe7849a2f6
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=aaf46bfc55dccf57962ac12d804b6886620c20fc
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=1dcb4a39fd676441c30ce5614c2ae6082114837d
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=d1a0e930a8698deb32d8356bc13403fdd86e2b78
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=86b0dab7ea8b0252fe30506b08074f4ef4798219
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=505eaaf3490c21de00e636d012f513f4334ed5c3
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=8adce413f5f92bd8e4c485ee61ff6b8448cd2058
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=4c87170494cbdd680cb4b128dd60fcdaac995609
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=9dce0818378feefe0aa7844f51f48e03a01607dc
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=f399c3ef9d0db8c95113b242e0c69498cf077669
-- Add Patch http://code.stapelberg.de/git/i3/commit/?id=d1a0e930a8698deb32d8356bc13403fdd86e2b78
 
 * Wed Jan 06 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-3
 - Add Missing R: xorg-x11-fonts-misc
 - Add i3-logo as SOURCE1 and install it to DATADIR/pixmaps
 
 * Sun Dec 27 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-2
-- Add missing Requires for a functional minimal (not comfortable) i3-system. (The requirements provides functions which are used in the standard configfile)
+- Add missing Requires for a functional minimal (not comfortable) i3-system.
 - Build manpages and add them to main-pkg
-- Build doxygen generated documentation and add them to the documentation subpackage
+- Build doxygen generated documentation and add them to the doc subpackage
 
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-1
-- Correct version-tag (https://www.redhat.com/archives/fedora-devel-list/2009-December/msg01102.html) Thank you Michael
+- Correct version-tag (Thanks to Michael Schwendt)
 - Add more documentation (generated with asciidoc)
 
 * Fri Dec 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d-bf1_1


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-13/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	25 Dec 2009 21:29:16 -0000	1.2
+++ import.log	20 Mar 2010 18:57:16 -0000	1.3
@@ -1,2 +1,3 @@
 i3-3_d-1_fc12:HEAD:i3-3.d-1.fc12.src.rpm:1259783250
 i3-3_d-bf1_1_fc12:HEAD:i3-3.d-bf1_1.fc12.src.rpm:1261776426
+i3-3_d_bf1-4_20100320git_fc12:F-13:i3-3.d.bf1-4.20100320git.fc12.src.rpm:1269111486


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	25 Dec 2009 21:29:16 -0000	1.3
+++ sources	20 Mar 2010 18:57:16 -0000	1.4
@@ -1 +1 @@
-f2271064640d67c8a618c8c79451da75  i3-3.d-bf1.tar.bz2
+8b14b04a4f187eb3beb719319f1a8495  i3-3.d-bf1-20100320git.tar.bz2


--- i3-3.d-bf1-1dcb4a39fd676441c30ce5614c2ae6082114837d.patch DELETED ---


--- i3-3.d-bf1-4c87170494cbdd680cb4b128dd60fcdaac995609.patch DELETED ---


--- i3-3.d-bf1-505eaaf3490c21de00e636d012f513f4334ed5c3.patch DELETED ---


--- i3-3.d-bf1-6de212f7eec993346d24af5333ceedfe7849a2f6.patch DELETED ---


--- i3-3.d-bf1-86b0dab7ea8b0252fe30506b08074f4ef4798219.patch DELETED ---


--- i3-3.d-bf1-8adce413f5f92bd8e4c485ee61ff6b8448cd2058.patch DELETED ---


--- i3-3.d-bf1-9dce0818378feefe0aa7844f51f48e03a01607dc.patch DELETED ---


--- i3-3.d-bf1-aaf46bfc55dccf57962ac12d804b6886620c20fc.patch DELETED ---


--- i3-3.d-bf1-d1a0e930a8698deb32d8356bc13403fdd86e2b78.patch DELETED ---


--- i3-3.d-bf1-f399c3ef9d0db8c95113b242e0c69498cf077669.patch DELETED ---

