rpms/comix/devel .cvsignore, 1.14, 1.15 comix.spec, 1.25, 1.26 sources, 1.14, 1.15

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25151

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.4-1
- 4.0.4, remove upsteamed patch
- Embed Fedora EVR to src/about.py



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Feb 2009 06:54:54 -0000	1.14
+++ .cvsignore	8 Apr 2009 08:18:31 -0000	1.15
@@ -1 +1 @@
-comix-4.0.3.tar.gz
+comix-4.0.4.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- comix.spec	28 Feb 2009 15:24:42 -0000	1.25
+++ comix.spec	8 Apr 2009 08:18:32 -0000	1.26
@@ -3,12 +3,12 @@
 # mv trunk comix-%%mainver
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
-%define		mainver		4.0.3
+%define		mainver		4.0.4
 %undefine		alphatag	
 %define		comix4		1
 
 %undefine		ifalpha		
-%define		fedorarel	3
+%define		fedorarel	1
 
 Name:		comix
 Version:	%{mainver}
@@ -23,8 +23,6 @@
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-# Use upstreamed patch
-Patch0:		comix-4.0.3-filechooser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -50,7 +48,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
-%patch0 -p0 -b .filechooser
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -65,6 +62,12 @@
 	( touch -r COPYING COPYING.tmp ; %{__mv} -f COPYING.tmp COPYING )
 %{__rm} -f COPYING.tmp
 
+# embed Fedora EVR
+%{__sed} -i -e "/^VERSION/s|^\(.*\)$|\1\nVERSION_fedora = '%{version}-%{release}'|" \
+	src/constants.py
+%{__sed} -i -e "s|constants\.VERSION|constants.VERSION_fedora|" \
+	src/about.py
+
 for dir in messages/*/LC*/
 do
 	msgfmt --statistics -o $dir/comix.mo $dir/comix.po
@@ -182,6 +185,10 @@
 
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.4-1
+- 4.0.4, remove upsteamed patch
+- Embed Fedora EVR to src/about.py
+
 * Sat Feb 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-3
 - Use upstreamed patch for filechooser issue
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Feb 2009 06:54:55 -0000	1.14
+++ sources	8 Apr 2009 08:18:32 -0000	1.15
@@ -1 +1 @@
-e5bd7acefe3950c2fdaf8785edd27b7e  comix-4.0.3.tar.gz
+029227a77b122f7080ee0280d41bee78  comix-4.0.4.tar.gz