Sat Mar 20 18:57:35 UTC 2010

Author: cassmodiah

Update of /cvs/pkgs/rpms/i3status/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16887/F-12

Modified Files:
	.cvsignore i3status.spec import.log sources 
Removed Files:
	i3status-2.0-18c4b9866d395720077e815d85755a8ac54354ca.patch 
	i3status-2.0-37882cee889d556a932d26084119f516d6639b13.patch 
	i3status-2.0-6823fbf05537ca88716f403235cea5e7064ef9b1.patch 
	i3status-2.0-9307ff9d131a70164a50e57e3aa3115c92715925.patch 
	i3status-2.0-998109a6537c4534652673ff25d72a502cb15605.patch 
	i3status-2.0-9c14b7a527a34f0ed04a53c72fe85f4d21f094ec.patch 
	i3status-2.0-a5594ee17f967d037a558b55aba0ae6c6e1077b9.patch 
	i3status-2.0-c166d2e2d312e198a4dc9039302c5b82ed2805d1.patch 
	i3status-2.0-ced822f4611b7c3f6df49cae188ab05aa65ab0d6.patch 
Log Message:
update to newest git



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/i3status/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	2 Dec 2009 19:50:07 -0000	1.2
+++ .cvsignore	20 Mar 2010 18:57:35 -0000	1.3
@@ -1 +1 @@
-i3status-2.0.tar.bz2
+i3status-2.0-20100320git.tar.bz2


Index: i3status.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3status/F-12/i3status.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- i3status.spec	5 Feb 2010 20:04:07 -0000	1.2
+++ i3status.spec	20 Mar 2010 18:57:35 -0000	1.3
@@ -1,33 +1,21 @@
+%global git 20100320git
+%global gitversion 21dcff2
+
 Name:           i3status
 Version:        2.0
-Release:        2%{?dist}
+Release:        3.%{git}%{?dist}
 Summary:        Generates a status line for dzen2 or wmii
 
 Group:          User Interface/Desktops
 License:        MIT
 URL:            http://i3.zekjur.net/i3status/
-Source0:        http://i3.zekjur.net/%{name}/%{name}-%{version}.tar.bz2
+#Source0:        http://i3.zekjur.net/%{name}/%{name}-%{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}-%{version}-%{git}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# The load values represent 1,5,15 min, not 5,10,15 min (Thanks Chris)
-Patch0: %{name}-2.0-9307ff9d131a70164a50e57e3aa3115c92715925.patch
-# Implemented showing the time when battery is empty
-Patch1: %{name}-2.0-a5594ee17f967d037a558b55aba0ae6c6e1077b9.patch
-# Remove trailing whitespace
-Patch2: %{name}-2.0-998109a6537c4534652673ff25d72a502cb15605.patch
-# ipv6: reuse the existing socket for further lookups
-Patch3: %{name}-2.0-37882cee889d556a932d26084119f516d6639b13.patch
-# ipv6: cache the result of the DNS query only, the socket needs to be re-created every time
-Patch4: %{name}-2.0-ced822f4611b7c3f6df49cae188ab05aa65ab0d6.patch
-# disk: also round when printing TB (Thanks Merovius)
-Patch5: %{name}-2.0-6823fbf05537ca88716f403235cea5e7064ef9b1.patch
-# get_ip_address: return NULL instead of down
-Patch6: %{name}-2.0-c166d2e2d312e198a4dc9039302c5b82ed2805d1.patch
-# wireless: display no IP instead of (null)
-Patch7: %{name}-2.0-9c14b7a527a34f0ed04a53c72fe85f4d21f094ec.patch
-# Instead of a relative sleep(1), sleep until the full second
-Patch8: %{name}-2.0-18c4b9866d395720077e815d85755a8ac54354ca.patch
-
 BuildRequires:  libconfuse-devel
 BuildRequires:  wireless-tools-devel
 BuildRequires:  asciidoc
@@ -40,24 +28,19 @@ pseudo filesystem.
 
 
 %prep
-%setup -q
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%setup -q -n %{name}
 
-sed -e 's|CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare|CFLAGS+=%{optflags} -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare|g' \
+sed \
+    -e 's|CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare|CFLAGS+=%{optflags} -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare|g' \
+    -e 's|CFLAGS+=-g|CFLAGS+=|g' \
+    -e 's|VERSION=$(shell git describe --tags --abbrev=0)|VERSION=2.0-%{gitversion}|g' \
+    -e 's|@echo " CC $<"|@echo " $(CC) $(CFLAGS) -c -o $@ $<"|g' \
+    -e 's|@echo " LD $@"|@echo " $(CC) -o $@ src/*.o *.o $(LDFLAGS)"|g' \
     -i Makefile
 
 
 %build
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
 
 
 %install
@@ -85,18 +68,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Mar 20 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 2.0-4.20100320git
+- Update to current git
+
 * Sat Feb 05 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 2.0-2
 - Some bugfixes (sync with upstream)
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=9307ff9d131a70164a50e57e3aa3115c92715925
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=a5594ee17f967d037a558b55aba0ae6c6e1077b9
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=998109a6537c4534652673ff25d72a502cb15605
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=37882cee889d556a932d26084119f516d6639b13
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=ced822f4611b7c3f6df49cae188ab05aa65ab0d6
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=6823fbf05537ca88716f403235cea5e7064ef9b1
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=c166d2e2d312e198a4dc9039302c5b82ed2805d1
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=9c14b7a527a34f0ed04a53c72fe85f4d21f094ec
-- Add patch http://code.stapelberg.de/git/i3status/commit/?id=18c4b9866d395720077e815d85755a8ac54354ca
-
 
 * Wed Dec 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 2.0-1
 - Package build for Fedora


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/i3status/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Dec 2009 19:50:07 -0000	1.1
+++ import.log	20 Mar 2010 18:57:35 -0000	1.2
@@ -1 +1,2 @@
 i3status-2_0-1_fc12:F-12:i3status-2.0-1.fc12.src.rpm:1259783203
+i3status-2_0-3_20100320git_fc12:F-12:i3status-2.0-3.20100320git.fc12.src.rpm:1269111487


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/i3status/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	2 Dec 2009 19:50:07 -0000	1.2
+++ sources	20 Mar 2010 18:57:35 -0000	1.3
@@ -1 +1 @@
-0718095874aed604fe58a7de08cde530  i3status-2.0.tar.bz2
+c072f96bcef2516eeed367503f3bf27d  i3status-2.0-20100320git.tar.bz2


--- i3status-2.0-18c4b9866d395720077e815d85755a8ac54354ca.patch DELETED ---


--- i3status-2.0-37882cee889d556a932d26084119f516d6639b13.patch DELETED ---


--- i3status-2.0-6823fbf05537ca88716f403235cea5e7064ef9b1.patch DELETED ---


--- i3status-2.0-9307ff9d131a70164a50e57e3aa3115c92715925.patch DELETED ---


--- i3status-2.0-998109a6537c4534652673ff25d72a502cb15605.patch DELETED ---


--- i3status-2.0-9c14b7a527a34f0ed04a53c72fe85f4d21f094ec.patch DELETED ---


--- i3status-2.0-a5594ee17f967d037a558b55aba0ae6c6e1077b9.patch DELETED ---


--- i3status-2.0-c166d2e2d312e198a4dc9039302c5b82ed2805d1.patch DELETED ---


--- i3status-2.0-ced822f4611b7c3f6df49cae188ab05aa65ab0d6.patch DELETED ---

