rpms/ochusha/devel ochusha-0.5.99.63.2-call-g_thread_init-once.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ochusha.spec, 1.1, 1.2 sources, 1.2, 1.3 ochusha-0.5.8.2-cookie-hana-mogera.patch, 1.1, NONE ochusha-0.5.8.2-glib-deprecated-option.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat Nov 11 16:09:10 UTC 2006
Author: mtasaka
Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6797
Modified Files:
.cvsignore ochusha.spec sources
Added Files:
ochusha-0.5.99.63.2-call-g_thread_init-once.patch
Removed Files:
ochusha-0.5.8.2-cookie-hana-mogera.patch
ochusha-0.5.8.2-glib-deprecated-option.patch
Log Message:
* Sat Nov 11 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.63.2-0.1.cvs061111
- Update to 0.5.99.63.2
ochusha-0.5.99.63.2-call-g_thread_init-once.patch:
--- NEW FILE ochusha-0.5.99.63.2-call-g_thread_init-once.patch ---
--- ochusha-build/ochusha/main.cc.gthread 2006-11-07 22:24:08.000000000 +0900
+++ ochusha-build/ochusha/main.cc 2006-11-11 22:47:11.000000000 +0900
@@ -155,6 +155,7 @@
g_option_context_set_help_enabled(option_context, TRUE);
GError *error = NULL;
+ // g_option_context_parse calls g_thread_init
g_option_context_parse(option_context, &argc, &argv, &error);
if (error != NULL)
@@ -199,7 +200,7 @@
xmlInitParser();
- g_thread_init(NULL);
+ //g_thread_init(NULL);
ochusha_gdk_lock = Lock::get_slave_lock();
gdk_threads_set_lock_functions(ochusha_gdk_threads_enter,
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 27 Aug 2006 10:25:50 -0000 1.2
+++ .cvsignore 11 Nov 2006 16:08:40 -0000 1.3
@@ -1 +1 @@
-ochusha-0.5.8.2.tar.bz2
+ochusha-0.5.99.63.2-cvs061111.tar.bz2
Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ochusha.spec 27 Aug 2006 10:25:50 -0000 1.1
+++ ochusha.spec 11 Nov 2006 16:08:40 -0000 1.2
@@ -1,67 +1,108 @@
+%define with_system_ca_cert_file 1
+%define system_ca_cert_file %{_sysconfdir}/pki/tls/cert.pem
+
+%define main_ver 0.5.99.63.2
+%define strtag cvs061111
+
+%define vendor_rel 1
+%define pre_release 1
+
+%if %{pre_release}
+%define rel 0.%{vendor_rel}.%{strtag}%{?dist}
+%else
+%define rel %{vendor_rel}%{?dist}
+%endif
+
Summary: A GTK+ 2ch.net BBS Browser
Name: ochusha
-Version: 0.5.8.2
-Release: 3%{?dist}
+Version: %{main_ver}
+Release: %{rel}
URL: http://ochusha.sourceforge.jp/
+%if %{pre_release}
+Source: %{name}-%{main_ver}-%{strtag}.tar.bz2
+%else
Source: http://keihanna.dl.sourceforge.jp/ochusha/16560/%{name}-%{version}.tar.bz2
-# These patches are from discussion on
-# http://pc8.2ch.net/test/read.cgi/linux/1148809116/
-Patch1: ochusha-0.5.8.2-glib-deprecated-option.patch
-Patch2: ochusha-0.5.8.2-cookie-hana-mogera.patch
+%endif
+Patch0: ochusha-0.5.99.63.2-call-g_thread_init-once.patch
License: BSD
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-Requires(post): /sbin/ldconfig
-Requires(post): %{_bindir}/update-desktop-database
-Requires(post): %{_bindir}/gtk-update-icon-cache
-Requires(postun): /sbin/ldconfig
-Requires(postun): %{_bindir}/update-desktop-database
-Requires(postun): %{_bindir}/gtk-update-icon-cache
Requires: fonts-japanese
-BuildRequires: gtk2-devel
+Requires: %{system_ca_cert_file}
+
+BuildRequires: libtool
+BuildRequires: gettext
BuildRequires: libSM-devel
+BuildRequires: libXt-devel
BuildRequires: libxml2-devel
+BuildRequires: gtk2-devel
BuildRequires: openssl-devel
-BuildRequires: zlib-devel
BuildRequires: desktop-file-utils
-BuildRequires: libXt-devel
%description
The ochusha is BBS, especially 2ch.net, browser with GUI.
It uses the GTK+ toolkit for all of its interface needs.
The ochusha offers a sort of features such as multi-level
-popup view of `response's, inlining and popup view of
+popup view of `response's, embeded and popup view of
images that helps users to interact with BBSs.
%prep
+%if %{pre_release}
+%setup -q -n %{name}-%{main_ver}-%{strtag}
+%else
%setup -q
+%endif
-%patch1 -p1 -b .glib
-%patch2 -p1 -b .cookie
+%patch0 -p1 -b .g_thread_init
# change desktop entry to use png file in
# %{icondir}
-%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' gtk2/ochusha.desktop.in
+%{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
+
+# Now rawhide has autoconf >= 2.60
+%{__sed} -i.ver -e 's|2.5\[.*\]|2.6[0-9]|' autogen.sh
+%{__chmod} 0755 autogen.sh
%build
-%configure
+sh autogen.sh
+
+%configure \
+%if %{with_system_ca_cert_file}
+ --with-ca-cert-file=%{system_ca_cert_file}
+%endif
+
%{__make} %{?_smp_flags}
%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
+# find lang
+%find_lang %{name}
+%find_lang %{name}-properties
+
+%{__cat} *.lang > all.lang
+
+# License
+if test -f "oniguruma/COPYING"; then
+ %{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
+fi
+
# remove unneeded files
%{__rm} -f %{buildroot}%{_libdir}/lib*.{a,la,so}
+%if %{with_system_ca_cert_file}
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
+%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
+%endif
# install desktop file and delete original
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install \
--delete-original \
--vendor fedora \
+ --remove-category Application \
--dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora \
%{buildroot}%{_datadir}/ochusha/%{name}.desktop
# link Icon png to icondir
@@ -82,10 +123,7 @@
change_encoding EUCJP \
BUGS ChangeLog INSTALL.jp NEWS README TODO \
- gtk2/ochusha-gtkrc.gray
-
-# install mo files
-%find_lang %{name}
+ ochusha/ochusha-gtkrc.gray
%clean
%{__rm} -rf %{buildroot}
@@ -94,27 +132,38 @@
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-%{_bindir}/update-desktop-database %{_datadir}/applications &>/dev/null || :
-%files -f %{name}.lang
+%files -f all.lang
%defattr(-,root,root)
-%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog INSTALL* NEWS README TODO
-%doc gtk2/ochusha-gtkrc.*
+# BUGS is empty for now, however I include it for now.
+%doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+%doc ochusha/ochusha-gtkrc.*
+%doc oniguruma/COPYING.oniguruma
+
%{_bindir}/ochusha
-%{_libdir}/*.so.*
+%{_libdir}/lib*
+
%{_datadir}/applications/fedora-*.desktop
%{_datadir}/icons/hicolor/48x48/apps/*.png
-%{_datadir}/ochusha
-%{_mandir}/man*/ochusha.1*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+
+%{_mandir}/man1/%{name}.1*
%changelog
+* Sat Nov 11 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.63.2-0.1.cvs061111
+- Update to 0.5.99.63.2
+
+* Fri Nov 03 2006 <fuyu at users.sourceforge.jp> 0.5.99.62-1
+- Version down.
+- Specify the CA certificate file bundled within openssl package.
+
* Sat Aug 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.8.2-3
- Install (link) icon to the usual directory and use
cache updating method.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 27 Aug 2006 10:25:50 -0000 1.2
+++ sources 11 Nov 2006 16:08:40 -0000 1.3
@@ -1 +1 @@
-167edce1d41f766d18018175458373c7 ochusha-0.5.8.2.tar.bz2
+cf91062cc155ef2fef14e8ec0b8d1b8b ochusha-0.5.99.63.2-cvs061111.tar.bz2
--- ochusha-0.5.8.2-cookie-hana-mogera.patch DELETED ---
--- ochusha-0.5.8.2-glib-deprecated-option.patch DELETED ---
More information about the scm-commits
mailing list