rpms/jd/devel .cvsignore, 1.212, 1.213 jd.spec, 1.247, 1.248 sources, 1.213, 1.214

Sat Mar 22 17:51:33 UTC 2008

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3274

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sun Mar 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.svn1896
- svn 1896 (version 2.0.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213

--- .cvsignore	9 Mar 2008 16:52:04 -0000	1.212
+++ .cvsignore	22 Mar 2008 17:50:53 -0000	1.213
@@ -1,3 +1 @@
-jd-1.9.9-beta080225.tgz
-jd-2.0.0-svn1763_jdsksy.tgz
-jd-2.0.0-svn1892_trunk.tgz
+jd-2.0.0-svn1896_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- jd.spec	22 Mar 2008 16:52:39 -0000	1.247
+++ jd.spec	22 Mar 2008 17:50:53 -0000	1.248
@@ -22,7 +22,7 @@
 
 %if             %use_trunk
 %define         main_ver      2.0.0
-%define         strtag        svn1892_trunk
+%define         strtag        svn1896_trunk
 %define         _pre_release  1
 %endif
 
@@ -65,7 +65,7 @@
 
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}.1
+Release:        %{rel}
 Summary:        A 2ch browser
 
 Group:          Applications/Internet
@@ -96,7 +96,23 @@
 %setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+# Workaround for bug 438600
+%if 0%{?fedora} >= 9
+%{__mkdir_p} cairomm-1.0/cairomm
+%{__sed} \
+	-e 's|CAIRO_FONT_TYPE_ATSUI|CAIRO_FONT_TYPE_QUARTZ|' \
+	%{_includedir}/cairomm-1.0/cairomm/enums.h > \
+	cairomm-1.0/cairomm/enums.h
+%{__mkdir_p} pkgconfig
+%{__sed} \
+	-e "s|\(Cflags: \)\(.*\)$|\1-I$(pwd)/cairomm-1.0 \2|" \
+	%{_libdir}/pkgconfig/cairomm-1.0.pc > \
+	pkgconfig/cairomm-1.0.pc
+%endif
+
 %build
+export PKG_CONFIG_PATH=$(pwd)/pkgconfig
+
 sh autogen.sh
 
 # set TZ for __TIME__
@@ -143,8 +159,11 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Mon Mar 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.svn1892
-- svn 1892 (version 2.0.0)
+* Sun Mar 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.svn1896
+- svn 1896 (version 2.0.0)
+
+* Sun Mar 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 
+- Workaround for bug 438600
 
 * Mon Feb 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.9.9-0.3.beta080225
 - 1.9.9 beta 080225


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/sources,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- sources	9 Mar 2008 16:52:04 -0000	1.213
+++ sources	22 Mar 2008 17:50:53 -0000	1.214
@@ -1,3 +1 @@
-5fcca1803f2f0ab384f79236e0d3f392  jd-1.9.9-beta080225.tgz
-e0de8ba3fde4a2f4ccf989f8b4842076  jd-2.0.0-svn1763_jdsksy.tgz
-fda045510621d0457e7c23b142493085  jd-2.0.0-svn1892_trunk.tgz
+7d5c181dc137e609bd21bc5f46bc6ab6  jd-2.0.0-svn1896_trunk.tgz


