new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@971 ec354946-7b23-47d6-9f5a-488ba84defc7

j/jd/jd-vl.spec

@@ -1,9 +1,9 @@
 ###  for Vine Linux 4.x / 5.x  ###
 
-%define  pkg_version  2.6.0
-%define  strtag       100208
+%define  pkg_version  2.6.5
+%define  strtag       100425
 %define  repoid       40140
-%define  vendor_rel   2
+%define  vendor_rel   3
 
 %define  pre_release  0
 %if %{pre_release}
@@ -31,7 +31,8 @@ Source1:  jd-vl.desktop
 # Patch100: jd-2.5.0_http_201.patch
 # Patch100: jd-2.4.0_close_err_image.patch
 # Patch110: jd-2.4.0_tag_drawing_fix.patch
-Patch100: jd-2.6.0_gtkmm28.patch
+# Patch100: jd-2.6.0_gtkmm28.patch
+Patch110: jd-2.6.5_vine4.patch
 
 License:  GPL
 Group:    Applications/Internet
@@ -42,7 +43,8 @@ Requires:  glibmm
 Requires:  zlib >= 1.2
 Requires:  pango
 Requires:  gnutls >= 1.2
-Prereq:    desktop-file-utils
+Requires(pre): desktop-file-utils
+# Prereq:    desktop-file-utils
 
 BuildRequires:  libtool, automake, autoconf
 BuildRequires:  gtkmm2-devel >= 2.8
@@ -51,6 +53,7 @@ BuildRequires:  zlib-devel >= 1.2
 BuildRequires:  XOrg-devel
 BuildRequires:  pango-devel
 BuildRequires:  gnutls-devel >= 1.2
+BuildRequires:  libgpg-error-devel
 %if %{sound}
 BuildRequires:  alsa-lib-devel
 %endif
@@ -72,7 +75,10 @@ JD は gtkmm2 ベースの2ちゃんねる用ブラウザです。
 
 # Patch 100 - 200 are upstream patches
 # %patch100 -p2 -b .close_err_image
-%patch100 -p2 -b .gtkmm28
+# %patch100 -p2 -b .gtkmm28
+%if %{?_dist_release} == "vl4"
+%patch110 -p1 -b .vine4
+%endif
 
 %build
 autoreconf -i
@@ -119,6 +125,17 @@ update-desktop-database %{_datadir}/applications
 %{icondir}/*/apps/%{name}.png
 
 %changelog
+* Sun May  9 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.5-3
+- chaneg tag Prereq: -> Requires(pre):
+
+* Thu Apr 29 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.5-2
+- add patch110 to fix build error on Vine4
+- add BR: libgpg-error-devel
+
+* Wed Apr 28 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.5-1
+- new upstream release   
+- drop Patch100 (is included in new release)
+
 * Mon Mar 22 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.6.0-2
 - add Patch100 to build fix with <= gtkmm28 (Vine 4.x env)