rpms/comix/devel .cvsignore, 1.7, 1.8 comix.spec, 1.14, 1.15 sources, 1.7, 1.8

Mamoru Tasaka mtasaka at fedoraproject.org
Fri Oct 3 12:30:11 UTC 2008


Author: mtasaka

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

Modified Files:
	.cvsignore comix.spec sources 
Log Message:
F-11: prepare for comix 4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Jul 2008 15:52:01 -0000	1.7
+++ .cvsignore	3 Oct 2008 12:29:41 -0000	1.8
@@ -1 +1,2 @@
 comix-3.6.5.tar.gz
+comix-4.0-svn199_trunk.tar.gz


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- comix.spec	9 Jul 2008 15:52:01 -0000	1.14
+++ comix.spec	3 Oct 2008 12:29:41 -0000	1.15
@@ -1,12 +1,28 @@
+# To create svn tarball use:
+# svn co https://comix.svn.sourceforge.net/svnroot/comix/trunk
+# mv trunk comix-%%mainver
+# tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
+
+%define		mainver		4.0
+%define		alphatag	svn199_trunk
+%define		comix4		1
+
+%define		ifalpha		1
+%define		fedorarel	1
+
 Name:		comix
-Version:	3.6.5
-Release:	1%{?dist}
+Version:	%{mainver}
+Release:	%{?ifalpha:0.}%{fedorarel}%{?ifalpha:.%alphatag}%{?dist}
 Summary:	A user-friendly, customizable image viewer
 
 Group:		Amusements/Graphics
 URL:		http://comix.sourceforge.net/
 License:	GPLv2+
+%if 0%{?ifalpha}
+Source0:	%{name}-%{mainver}-%{alphatag}.tar.gz
+%else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -32,6 +48,10 @@
 %prep
 %setup -q
 
+%{__mkdir_p} TMPBIN
+%{__ln_s} -f /bin/true update-mime-database
+%{__ln_s} -f /bin/true gconftool-2
+
 %build
 %{__sed} -i -e 's|shutil.copy|shutil.copy2|' install.py
 
@@ -42,12 +62,17 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT%{_prefix}
+export PATH=$(pwd)/TMPBIN:${PATH}
 
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%{__python} install.py --installdir $RPM_BUILD_ROOT%{_prefix} install
+%{__python} install.py \
+%if %{comix4}
+	--dir \
+%else
+	--installdir \
+%endif
+	$RPM_BUILD_ROOT%{_prefix} \
+	install
 
-%{__sed} -i -e 's|comix.png|comix|' \
-	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install \
 	--vendor fedora \
 	--delete-original \
@@ -126,12 +151,25 @@
 %{_mandir}/man1/*
 
 %{_datadir}/icons/hicolor/*/apps/%{name}*
+%if %{comix4}
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-*.png
+%endif
+
+%if ! %{comix4}
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_datadir}/pixmaps/%{name}
 %{_datadir}/pixmaps/%{name}/*.png
+%else
+%dir	%{_datadir}/%{name}/
+%{_datadir}/%{name}/images/
+%{_datadir}/%{name}/src/
+%endif
 
 
 %changelog
+* Fri Oct  3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- 4.0 branch, rev 199
+
 * Thu Jul 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 3.6.5-1
 - 3.6.5 (2 patches applied upstream)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Jul 2008 15:52:01 -0000	1.7
+++ sources	3 Oct 2008 12:29:41 -0000	1.8
@@ -1 +1,2 @@
 4f6210ee04b5b01cb37ab58638278a03  comix-3.6.5.tar.gz
+cb79e3b4161408c33ae4bab02966735f  comix-4.0-svn199_trunk.tar.gz




More information about the fedora-extras-commits mailing list