rpms/ochusha/devel .cvsignore, 1.39, 1.40 ochusha.spec, 1.53, 1.54 sources, 1.39, 1.40 ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch, 1.1, NONE ochusha-0.5.99.66-cvs070110-suka-pontan.patch, 1.1, NONE

Mon Oct 20 07:43:44 UTC 2008

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5501

Modified Files:
	.cvsignore ochusha.spec sources 
Removed Files:
	ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch 
	ochusha-0.5.99.66-cvs070110-suka-pontan.patch 
Log Message:
* Mon Oct 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.99.67.1-0.2.cvs20081020_1
- Upstream development restarted, try latest
- Drop 2 patches (upstreamed)
- Also try to disable disable-lock-check.patch for trial
- Spec file clean up
- Move all libraries to %_libdir/%name, no need to make them system-wide,
  set rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40

--- .cvsignore	10 Jan 2007 18:49:48 -0000	1.39
+++ .cvsignore	20 Oct 2008 07:43:14 -0000	1.40
@@ -1 +1 @@
-ochusha-0.5.99.66-cvs070110.tar.bz2
+ochusha-0.5.99.67.1-cvs20081020_1.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ochusha.spec	20 Sep 2008 17:51:30 -0000	1.53
+++ ochusha.spec	20 Oct 2008 07:43:14 -0000	1.54
@@ -1,51 +1,58 @@
-%define              with_system_ca_cert_file    1
-%define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
+%define		__default_patch_fuzz	2
 
-%define              main_ver        0.5.99.66
-%define              strtag          cvs070110
+# To create CVS based tarball, do
+# $ cvs -z3 -d:pserver:anonymous at cvs.sourceforge.jp:/cvsroot/ochusha \
+#	co ochusha
+# ln -sf ochusha %%{name}-%%{main_ver}-%%{strtag}
+# tar cjf %%{name}-%%{main_ver}-%%{strtag}.tar.bz2 \
+#	%%{name}-%%{main_ver}-%%{strtag}/./
 
-%define              vendor_rel      6
-%define              pre_release     1
 
-%if %{pre_release}
-%define              rel             0.%{vendor_rel}.%{strtag}%{?dist}
-%else
-%define              rel             %{vendor_rel}%{?dist}
-%endif
+%define		with_system_ca_cert_file	1
+%define		system_ca_cert_file		%{_sysconfdir}/pki/tls/cert.pem
+
+%define		main_ver	0.5.99.67.1
+%define		strtag		cvs20081020_1
+%define		repoid		16560
+
+%define		vendor_rel	2
+%define		pre_release	1
 
-Summary:             A GTK+ 2ch.net BBS Browser
-Name:                ochusha
-Version:             %{main_ver}
-Release:             %{rel}
-URL:                 http://ochusha.sourceforge.jp/
 %if %{pre_release}
-Source:              %{name}-%{main_ver}-%{strtag}.tar.bz2
+%define		rel		0.%{vendor_rel}.%{strtag}%{?dist}
 %else
-Source:              http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
+%define		rel		%{vendor_rel}%{?dist}
 %endif
-Patch0:              ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
-Patch1:              ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch
-Patch2:              ochusha-0.5.99.66-cvs070110-suka-pontan.patch
-License:             BSD
-Group:               Applications/Internet
-BuildRoot:           %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
-%if 0%{?fedora} >= 10
-Requires:            mona-fonts-VLGothic
+Summary:	A GTK+ 2ch.net BBS Browser
+Name:		ochusha
+Version:	%{main_ver}
+Release:	%{rel}
+URL:		http://ochusha.sourceforge.jp/
+%if %{pre_release}
+Source:		%{name}-%{main_ver}-%{strtag}.tar.bz2
 %else
-Requires:            fonts-japanese
+Source:		http://downloads.sourceforge.jp/ochusha/%{repoid}/%{name}-%{version}.tar.bz2
 %endif
-Requires:            %{system_ca_cert_file}
-Requires:            xdg-utils
-
-BuildRequires:       libtool
-BuildRequires:       gettext
-BuildRequires:       libSM-devel
-BuildRequires:       libXt-devel
-BuildRequires:       libxml2-devel
-BuildRequires:       gtk2-devel
-BuildRequires:       openssl-devel
-BuildRequires:       desktop-file-utils
+Patch0:		ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
+License:	BSD
+Group:		Applications/Internet
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:	mona-fonts-VLGothic
+Requires:	%{system_ca_cert_file}
+Requires:	xdg-utils
+
+BuildRequires:	libtool
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	libSM-devel
+BuildRequires:	libXt-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	oniguruma-devel
+BuildRequires:	openssl-devel
+BuildRequires:	sqlite-devel
 
 %description
 The ochusha is BBS, especially 2ch.net, browser with GUI.
@@ -60,29 +67,37 @@
 %else
 %setup -q
 %endif
+
+# Try if this is no longer needed
+%if 0
 %patch0 -p1 -b .lock
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .sukapontan
+%endif
 
-# change desktop entry to use png file at %%{icondir}.
-%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
+# Icon path fix
+%{__sed} -i -e 's|Icon.*$|Icon=ochusha48|' ochusha/ochusha.desktop.in
 
-# set htmlview as a default browser
-%{__sed} -i -e 's|firefox|xdg-open|' ochusha/preferences.cc
+# set xdg-open as a default browser
+%{__sed} -i -e 's|firefox|xdg-open|' ochusha/ui_constants.h
 
-%build
 sh autogen.sh
 
+%build
+export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
 %configure \
+	--with-external-oniguruma \
 %if %{with_system_ca_cert_file}
-   --with-ca-cert-file=%{system_ca_cert_file}
+	--with-ca-cert-file=%{system_ca_cert_file} \
 %endif
+	--libdir=%{_libdir}/%{name}
 
 %{__make} %{?_smp_flags}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+%{__make} \
+	DESTDIR=%{buildroot} \
+	INSTALL="%{__install} -p" \
+	install
 
 # find lang
 %find_lang %{name}
@@ -92,16 +107,14 @@
 
 # Licenses.
 if test -f "oniguruma/COPYING"; then
-  %{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
+	%{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
 fi
 if test -f "libochushagtk_lgpl/COPYING"; then
-  %{__mv} libochushagtk_lgpl/COPYING libochushagtk_lgpl/COPYING.libochushagtk_lgpl
+	%{__mv} libochushagtk_lgpl/COPYING libochushagtk_lgpl/COPYING.libochushagtk_lgpl
 fi
 
 # remove unneeded files
-%{__rm} -f %{buildroot}/%{_libdir}/*.a
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -f %{buildroot}/%{_libdir}/*.so
+%{__rm} -f %{buildroot}/%{_libdir}/%{name}/*.{a,la,so}
 %if %{with_system_ca_cert_file}
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
@@ -109,14 +122,12 @@
 
 # install desktop file and delete original
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{__sed} -i -e 's|ochusha48\.png|ochusha48|' \
-      %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 desktop-file-install \
-      --delete-original \
-      --vendor fedora \
-      --remove-category Application \
-      --dir %{buildroot}%{_datadir}/applications \
-      %{buildroot}%{_datadir}/ochusha/%{name}.desktop
+	--delete-original \
+	--vendor fedora \
+	--remove-category Application \
+	--dir %{buildroot}%{_datadir}/applications \
+	%{buildroot}%{_datadir}/ochusha/%{name}.desktop
 
 # link icon to icondir according to Icon Theme Specification.
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
@@ -125,53 +136,68 @@
 
 # change documents' encoding to UTF-8.
 change_encoding(){
-   CODE=$1
-   shift
-   for f in $* ; do
-      mv ${f} ${f}.tmp
-      iconv -f $CODE -t UTF-8 ${f}.tmp > ${f} && rm -f ${f}.tmp || \
-         mv ${f}.tmp ${f}
-   done
+
+CODE=$1
+shift
+for f in $*
+do
+	%{__mv} ${f} ${f}.tmp
+	iconv -f $CODE -t UTF-8 ${f}.tmp > ${f} && 
+		( touch -r ${f}.tmp $f ; %{__rm} -f ${f}.tmp ) || \
+		%{__mv} ${f}.tmp ${f}
+done
+
 }
 
-change_encoding EUCJP \
-   BUGS ChangeLog NEWS README TODO \
-   ochusha/ochusha-gtkrc.gray
+change_encoding \
+	EUCJP \
+	BUGS ChangeLog NEWS README TODO \
+	ochusha/ochusha-gtkrc.gray
 
 %clean
-%{__rm} -rf %{buildroot}
+%{__rm} -rf %{buildroot}/
 
 %post
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-/sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files -f all.lang
 %defattr(-,root,root)
-%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-%doc ochusha/ochusha-gtkrc.*
-%doc oniguruma/COPYING.oniguruma
-%doc libochushagtk_lgpl/COPYING.libochushagtk_lgpl
-
-%{_bindir}/ochusha
-%{_datadir}/%{name}/*
-%{_datadir}/applications/fedora-%{name}.desktop
-%dir %{_datadir}/%{name}
-%{_libdir}/lib*
+%doc	ACKNOWLEDGEMENT AUTHORS 
+%doc	BUGS 
+%doc	COPYING ChangeLog 
+%doc	NEWS 
+%doc	README 
+%doc	TODO
+%doc	ochusha/ochusha-gtkrc.*
+#%%doc oniguruma/COPYING.oniguruma
+%doc	libochushagtk_lgpl/COPYING.libochushagtk_lgpl
+
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
+%{_libdir}/%{name}/
 %{_mandir}/man1/%{name}.1*
 
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.6.cvs070110
+* Mon Oct 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.99.67.1-0.2.cvs20081020_1
+- Upstream development restarted, try latest
+- Drop 2 patches (upstreamed)
+- Also try to disable disable-lock-check.patch for trial
+- Spec file clean up
+- Move all libraries to %%_libdir/%%name, no need to make them system-wide,
+  set rpath
+
+* Sun Sep 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.99.66-0.6.cvs070110
 - Patch to deal with occational cookie change
 
-* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - ochusha-0.5.99.66-0.5.cvs070110
+* Mon Jul 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.99.66-0.5.cvs070110
 - Change Japanese fonts Requires (F-10+)
 
 * Sat Feb  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	10 Jan 2007 18:49:48 -0000	1.39
+++ sources	20 Oct 2008 07:43:14 -0000	1.40
@@ -1 +1 @@
-1a6c508a439c8dcd9ae3d8ceab3f5ca4  ochusha-0.5.99.66-cvs070110.tar.bz2
+3d75ac3dabd4f8b52c07810f9d4b17f6  ochusha-0.5.99.67.1-cvs20081020_1.tar.bz2


--- ochusha-0.5.99.66-cvs070110-g++43-missing-headers.patch DELETED ---


--- ochusha-0.5.99.66-cvs070110-suka-pontan.patch DELETED ---


