rpms/i3/F-12 .cvsignore, 1.4, 1.5 i3.spec, 1.7, 1.8 import.log, 1.3, 1.4 sources, 1.4, 1.5
Simon Wesp
cassmodiah at fedoraproject.org
Tue Mar 30 19:22:27 UTC 2010
- Previous message: rpms/i3/F-13 .cvsignore, 1.4, 1.5 i3.spec, 1.7, 1.8 import.log, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/frysk/F-12 frysk-0.4-flushstat.patch, NONE, 1.1 frysk-0.4-ftrace.patch, NONE, 1.1 frysk.spec, 1.164, 1.165
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cassmodiah
Update of /cvs/pkgs/rpms/i3/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24695/F-12
Modified Files:
.cvsignore i3.spec import.log sources
Log Message:
new upstrem release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 20 Mar 2010 18:57:27 -0000 1.4
+++ .cvsignore 30 Mar 2010 19:22:27 -0000 1.5
@@ -1 +1 @@
-i3-3.d-bf1-20100320git.tar.bz2
+i3-3.e.tar.bz2
Index: i3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/i3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- i3.spec 20 Mar 2010 18:57:29 -0000 1.7
+++ i3.spec 30 Mar 2010 19:22:27 -0000 1.8
@@ -1,19 +1,11 @@
-%global upstream_version 3.d-bf1
-%global git 20100320git
-%global gitversion bbea32f
-
Name: i3
-Version: 3.d.bf1
-Release: 4.%{git}%{?dist}
+Version: 3.e
+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
-# 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
+Source0: http://i3.zekjur.net/downloads/%{name}-%{version}.tar.bz2
Source1: %{name}-logo.svg
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +15,7 @@ BuildRequires: xcb-proto
BuildRequires: libev-devel
BuildRequires: libxkbfile-devel
BuildRequires: libX11-devel
+BuildRequires: yajl-devel
BuildRequires: bison
BuildRequires: flex
BuildRequires: asciidoc
@@ -56,18 +49,25 @@ Asciidoc and doxygen generated documenta
%prep
-%setup -q -n %{name}
+%setup -q
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|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
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+sed -e '/perl(AnyEvent::I3)/d'
+EOF
+
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
%build
make %{?_smp_mflags} V=1
@@ -102,8 +102,9 @@ 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
@@ -118,6 +119,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Mar 30 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 3.e-1
+- New upstream release
+
* Sat Mar 20 2010 Simon Wesp <cassmodiah at fedoraproject.org> - 3.d.bf1-4.20100320git
- Update to current git
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 20 Mar 2010 18:57:29 -0000 1.3
+++ import.log 30 Mar 2010 19:22:27 -0000 1.4
@@ -1,3 +1,4 @@
i3-3_d-1_fc12:F-12:i3-3.d-1.fc12.src.rpm:1259783250
i3-3_d-bf1_1_fc12:F-12:i3-3.d-bf1_1.fc12.src.rpm:1261776428
i3-3_d_bf1-4_20100320git_fc12:F-12:i3-3.d.bf1-4.20100320git.fc12.src.rpm:1269111445
+i3-3_e-1_fc12:F-12:i3-3.e-1.fc12.src.rpm:1269976976
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/i3/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 20 Mar 2010 18:57:29 -0000 1.4
+++ sources 30 Mar 2010 19:22:27 -0000 1.5
@@ -1 +1 @@
-8b14b04a4f187eb3beb719319f1a8495 i3-3.d-bf1-20100320git.tar.bz2
+28b70cc287e2c6607576171c3c6b3fdf i3-3.e.tar.bz2
- Previous message: rpms/i3/F-13 .cvsignore, 1.4, 1.5 i3.spec, 1.7, 1.8 import.log, 1.3, 1.4 sources, 1.4, 1.5
- Next message: rpms/frysk/F-12 frysk-0.4-flushstat.patch, NONE, 1.1 frysk-0.4-ftrace.patch, NONE, 1.1 frysk.spec, 1.164, 1.165
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list