rpms/jd/F-12 jd-2.6.0-rc100130-env-pkg-distro-specific.patch, NONE, 1.1 .cvsignore, 1.428, 1.429 jd.spec, 1.492, 1.493 sources, 1.429, 1.430

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/jd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13971/F-12

Modified Files:
	.cvsignore jd.spec sources 
Added Files:
	jd-2.6.0-rc100130-env-pkg-distro-specific.patch 
Log Message:
* Thu Feb  4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- rev 3342


jd-2.6.0-rc100130-env-pkg-distro-specific.patch:
 environment.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE jd-2.6.0-rc100130-env-pkg-distro-specific.patch ---
--- jd-2.6.0-rc100130/src/environment.cpp.distro	2009-06-16 00:34:09.000000000 +0900
+++ jd-2.6.0-rc100130/src/environment.cpp	2010-02-03 03:52:28.000000000 +0900
@@ -478,7 +478,7 @@
 //    "[リポジトリ ] " << SVN_REPOSITORY << "\n" <<
 //#endif
     "[ディストリ ] " << distribution << "\n" <<
-    "[パッケージ] " << "バイナリ/ソース( <配布元> )" << "\n" <<
+    "[パッケージ] " << "ディストリ配布のバイナリrpm" << "\n" <<
     "[ DE／WM ] " << desktop << "\n" <<
     "[　gtkmm 　] " << get_gtkmm_version() << "\n" <<
     "[　glibmm 　] " << get_glibmm_version()<< "\n" <<


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/.cvsignore,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -p -r1.428 -r1.429
--- .cvsignore	30 Jan 2010 15:06:01 -0000	1.428
+++ .cvsignore	3 Feb 2010 20:21:54 -0000	1.429
@@ -1 +1 @@
-jd-2.6.0-rc100130.tgz
+jd-2.6.0-svn3342_trunk.tgz


Index: jd.spec
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/jd.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- jd.spec	30 Jan 2010 15:06:01 -0000	1.492
+++ jd.spec	3 Feb 2010 20:21:55 -0000	1.493
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.6.0
-%define         strtag        rc100130
+%define         strtag        svn3342_trunk
 %define         repoid        45680
 # Define this if this is pre-version
 %define         pre_release   1
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -51,6 +51,7 @@ License:        GPLv2
 URL:            http://jd4linux.sourceforge.jp/
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -78,6 +79,11 @@ JD is a 2ch browser based on gtkmm2.
 %setup -q -n %{name}-%{main_ver}-%{strtag}
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
+# Fedora specific
+if ( uname -n | grep -q 'fedoraproject\.org' ) ; then
+%patch0 -p1 -b .env_fedora
+fi
+
 sh autogen.sh
 
 %build
@@ -135,6 +141,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{icondir}/%{name}.png
 
 %changelog
+* Thu Feb  4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- rev 3342
+
+* Tue Feb  2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Change env->pkg default item to Fedora specific
+
 * Sun Jan 31 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-0.3.rc100130
 - 2.6.0 rc 100130
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jd/F-12/sources,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -p -r1.429 -r1.430
--- sources	30 Jan 2010 15:06:01 -0000	1.429
+++ sources	3 Feb 2010 20:21:55 -0000	1.430
@@ -1 +1 @@
-fa192ebc9bfc9372afd8e692d6a549dc  jd-2.6.0-rc100130.tgz
+333ec27ce8aa53a6db220325012c3c63  jd-2.6.0-svn3342_trunk.tgz