rpms/jd/F-8 .cvsignore, 1.192, 1.193 jd.spec, 1.224, 1.225 sources, 1.193, 1.194

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26535/F-8

Modified Files:
	.cvsignore jd.spec sources 
Log Message:
* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.svn1777
- svn 1777 (version 2.0.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/.cvsignore,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- .cvsignore	7 Feb 2008 15:54:15 -0000	1.192
+++ .cvsignore	8 Feb 2008 17:27:50 -0000	1.193
@@ -1,3 +1,3 @@
 jd-1.9.8-svn1747_jd1.tgz
 jd-2.0.0-svn1763_jdsksy.tgz
-jd-2.0.0-svn1775_trunk.tgz
+jd-2.0.0-svn1777_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/jd.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- jd.spec	7 Feb 2008 15:54:15 -0000	1.224
+++ jd.spec	8 Feb 2008 17:27:50 -0000	1.225
@@ -22,7 +22,7 @@
 
 %if             %use_trunk
 %define         main_ver      2.0.0
-%define         strtag        svn1775_trunk
+%define         strtag        svn1777_trunk
 %define         _pre_release  1
 %endif
 
@@ -76,7 +76,6 @@
 URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-Patch0:		jd-2.0.0-svn1774_trunk-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -98,20 +97,8 @@
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-%patch0 -p1 -b .gcc43
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
-# Workarround for bug 431017
-# https://bugs.gentoo.org/show_bug.cgi?id=203931
-# http://bugzilla.gnome.org/show_bug.cgi?id=454882
-%if 0%{?fedora} >= 9
-%{__mkdir} INCLUDE
-sed -e \
-	'/SIGC_TYPEDEF_REDEFINE_ALLOWED/s|#define\(.*\)1|#undef\1|' \
-	%{_libdir}/sigc++-2.0/include/sigc++config.h \
-	> INCLUDE/sigc++config.h
-%endif
-
 %build
 sh autogen.sh
 
@@ -124,11 +111,7 @@
    --with-migemodict=%{migemo_dict}
 %endif
 
-%{__make} %{?_smp_mflags} \
-%if 0%{?fedora} >= 9
-	CXX="%{__cxx} -I$(pwd)/INCLUDE/" 
-%endif
-
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -163,8 +146,12 @@
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1775
-- svn 1775 (version 2.0.0)
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.svn1777
+- svn 1777 (version 2.0.0)
+
+* Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Remove patch for gcc43 (applied by upstream)
+- Remove workarround for libsigc++ side bug
 
 * Fri Feb  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.2.svn1774
 - Patch to make jd happy with gcc43


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-8/sources,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- sources	7 Feb 2008 15:54:15 -0000	1.193
+++ sources	8 Feb 2008 17:27:50 -0000	1.194
@@ -1,3 +1,3 @@
 c768cb816bdc327bbd9acfec6a6e2048  jd-1.9.8-svn1747_jd1.tgz
 e0de8ba3fde4a2f4ccf989f8b4842076  jd-2.0.0-svn1763_jdsksy.tgz
-93bf7ef55ffcceed2b29b37ef9aa481b  jd-2.0.0-svn1775_trunk.tgz
+5d7464d427d8c029c04ad70c46858ad1  jd-2.0.0-svn1777_trunk.tgz