diff --git a/.cvsignore b/.cvsignore index 2ed6652..b137688 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -jd-2.1.0-rc081223.tgz +jd-2.1.0-081228.tgz diff --git a/jd-rev2602-2608.diff b/jd-rev2602-2608.diff deleted file mode 100644 index ab8eeb7..0000000 --- a/jd-rev2602-2608.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/jdlib/loader.cpp -=================================================================== ---- src/jdlib/loader.cpp (revision 2602) -+++ src/jdlib/loader.cpp (revision 2608) -@@ -286,7 +286,9 @@ - - // プロキシ - m_data.host_proxy = data_in.host_proxy; -- if( ! m_data.host_proxy.empty() ){ -+ -+ // 先頭に *tp:// が付いていたら取り除く -+ if( ! m_data.host_proxy.empty() && m_data.host_proxy.find( "tp://" ) != std::string::npos ){ - const bool protocol = false; - m_data.host_proxy = MISC::get_hostname( m_data.host_proxy , protocol ); - } diff --git a/jd.spec b/jd.spec index 6bfce56..e835191 100644 --- a/jd.spec +++ b/jd.spec @@ -10,17 +10,17 @@ # Defined by upsteam # %define main_ver 2.1.0 -%define strtag rc081223 -%define repoid 36729 +%define strtag 081228 +%define repoid 36802 # Define this if this is pre-version -%define pre_release 1 +%define pre_release 0 ########################################## ########################################## # Defined by vendor # -%define vendor_rel 5 -%define extra_rel .svn2608_trunk +%define vendor_rel 1 +%define extra_rel %{nil} # Tag name changed from vendor to vendorname so as not to # overwrite Vendor entry in Summary %define vendorname fedora @@ -53,7 +53,6 @@ License: GPLv2 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-rev2602-2608.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{gtkmmdevel} @@ -79,7 +78,6 @@ JD is a 2ch browser based on gtkmm2. %prep %setup -q -n %{name}-%{main_ver}-%{strtag} -%patch0 -p0 -b .rev2608 #find . -name .svn | sort -r | xargs %{__rm} -rf sh autogen.sh @@ -135,6 +133,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %{icondir}/%{name}.png %changelog +* Mon Dec 29 2008 Mamoru Tasaka - 2.1.0-1 +- 2.1.0 + * Sun Dec 28 2008 Mamoru Tasaka - rev 2608 (patched against previous rc) diff --git a/sources b/sources index 43851bd..c8da869 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31754f4cb6d8b6d20e8b16af9cc7f529 jd-2.1.0-rc081223.tgz +e5d2294bf3635cd81b530bedbbcf0016 jd-2.1.0-081228.tgz