rpms/jd/devel jd-rev3586-try-gtkmm30.patch, NONE, 1.1 jd.spec, 1.507, 1.508

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/jd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4554

Modified Files:
	jd.spec 
Added Files:
	jd-rev3586-try-gtkmm30.patch 
Log Message:
Just try

jd-rev3586-try-gtkmm30.patch:
 configure.in |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE jd-rev3586-try-gtkmm30.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 3586)
+++ configure.in	(working copy)
@@ -77,6 +77,8 @@
 dnl
 dnl パッケージのチェック
 dnl
+PKG_CHECK_MODULES(GTKMM, [gtkmm-3.0 >= 2.90.5], [ echo "gtkmm >= 2.90.5" ; GTKMMVER=2295], [
+
 PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.12.0], [ echo "gtkmm >= 2.12.0" ; GTKMMVER=2120 ], [ 
 
 PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.8.0], [ echo "gtkmm >= 2.8.0" ; GTKMMVER=280 ], [ 
@@ -87,6 +89,7 @@
    ] ) 
 ] )
 ] )
+])
 PKG_CHECK_MODULES(GTHREAD, [gthread-2.0 >= 2.0] )
 CXXFLAGS="$CXXFLAGS -DGTKMMVER=$GTKMMVER"
 


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -p -r1.507 -r1.508
--- jd.spec	18 Jul 2010 07:27:30 -0000	1.507
+++ jd.spec	18 Jul 2010 10:06:53 -0000	1.508
@@ -41,9 +41,16 @@
 %define         migemo_dict   %{_datadir}/cmigemo/utf-8/migemo-dict
 ##########################################
 
+##########################################
+%define         try_gtkmm30   1
+%if 0%{?try_gtkmm30}
+%define         gtkmmdevel    gtkmm30-devel
+%endif
+##########################################
+
 Name:           jd
 Version:        %{main_ver}
-Release:        %{rel}
+Release:        %{rel}.1
 Summary:        A 2ch browser
 
 Group:          Applications/Internet
@@ -52,6 +59,7 @@ URL:            http://jd4linux.sourcefo
 Source0:        http://dl.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
 Patch0:         jd-2.6.0-rc100130-env-pkg-distro-specific.patch
+Patch1:         jd-rev3586-try-gtkmm30.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -79,18 +87,13 @@ JD is a 2ch browser based on gtkmm2.
 %setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
-# Workaround for bug 611781
-%if 0%{?fedora} >= 14
-mkdir -p TMPm4
-cat %{_datadir}/aclocal/pkg.m4 | sed -e 's|\(dnl.*\)$| \1|' > TMPm4/pkg.m4
-sed -i.m4 -e '/^aclocal/s|^\(.*\)$|\1 -ITMPm4|' autogen.sh
-sed -i.ver -e 's|for num in 10|for num in 11 10|' autogen.sh
-%endif
-
 # Fedora specific
 if ( uname -n | grep -q 'fedoraproject\.org' ) ; then
 %patch0 -p1 -b .env_fedora
 fi
+%if 0%{?try_gtkmm30}
+%patch1 -p0 -b .gtkmm30
+%endif
 
 sh autogen.sh