rpms/kazehakase/F-11 kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch, NONE, 1.1 kazehakase-0.5.8-gtkver.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 kazehakase.spec, 1.88, 1.89 sources, 1.30, 1.31 kazehakase-0.5.7-gtk0218.patch, 1.1, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Sep 29 15:33:06 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2109
Modified Files:
.cvsignore kazehakase.spec sources
Added Files:
kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
kazehakase-0.5.8-gtkver.patch
Removed Files:
kazehakase-0.5.7-gtk0218.patch
Log Message:
* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
- Update to 0.5.8
kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch ---
Index: libegg/pixbufthumbnail/Makefile.am
===================================================================
--- libegg/pixbufthumbnail/Makefile.am (revision 938)
+++ libegg/pixbufthumbnail/Makefile.am (working copy)
@@ -26,7 +26,7 @@
testeggpixbufthumbnail_LDADD = \
$(EGG_LIBS) \
- $(top_builddir)/libegg/pixbufthumbnail/libeggpixbufthumbnail.la
+ libeggpixbufthumbnail.la
testeggpixbufthumbnail_SOURCES = \
testeggpixbufthumbnail.c
kazehakase-0.5.8-gtkver.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kazehakase-0.5.8-gtkver.patch ---
--- kazehakase-0.5.8/configure.ac.gtk 2009-09-29 12:41:32.000000000 +0900
+++ kazehakase-0.5.8/configure.ac 2009-09-30 00:05:53.000000000 +0900
@@ -100,7 +100,7 @@
dnl **************************************************************
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
dnl in MODULES, pass to pkg-config
-AM_PATH_GTK_2_0(2.17.7, , ,[gthread])
+AM_PATH_GTK_2_0(2.14.0, , ,[gthread])
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore 29 Aug 2009 11:28:12 -0000 1.30
+++ .cvsignore 29 Sep 2009 15:33:06 -0000 1.31
@@ -1 +1 @@
-kazehakase-0.5.7.tar.gz
+kazehakase-0.5.8.tar.gz
Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- kazehakase.spec 9 Sep 2009 18:15:00 -0000 1.88
+++ kazehakase.spec 29 Sep 2009 15:33:06 -0000 1.89
@@ -12,7 +12,7 @@
%define rubyabi 1.8
%define support_webkit 1
-%undefine usesvn
+#%%define usesvn 0
%define need_autogen 0
%define min_webkit_EVR 1.1.1
@@ -30,14 +30,15 @@
%define obsolete_plugin_ver 0.4.5-1
-%define repoid 43338
-%define svnver 3783_trunk
+%define repoid 43802
+%define svnver 3859_trunk
+
#
# When changing release number, please make it sure that
# the new EVR won't be higher than the one of higher branch!!
#
-%define fedorarel 2
+%define fedorarel 1
%define _release %{fedorarel}%{?usesvn:.svn%svnver}
%if 0%{?fedora} < 1
@@ -45,9 +46,11 @@
%define support_webkit 0
%endif
+# Patch17 needs autotools
+%define need_autogen 1
Name: kazehakase
-Version: 0.5.7
+Version: 0.5.8
#
# When changing release number, please make it sure that
# the new EVR won't be higher than the one of higher branch!!
@@ -62,10 +65,12 @@ Source0: http://dl.sourceforge.jp/kazeha
Patch11: kazehakase-svn3756_trunk-workaround-rh447444.patch
Patch14: kazehakase-0.5.6-rev3769-embed-vendor-version.patch
%if 0%{?fedora} <= 11
-Patch15: kazehakase-0.5.7-gtk0218.patch
+Patch15: kazehakase-0.5.8-gtkver.patch
%endif
+Patch17: kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: dbus-devel
BuildRequires: expat-devel
BuildRequires: gnutls-devel
BuildRequires: gtk2-devel
@@ -122,6 +127,9 @@ This package uses Gecko for HTML renderi
%package base
Summary: Base package of Kazehakase
Group: Applications/Internet
+%if %{support_ruby} < 1
+Obsoletes: %{name}-ruby < %{version}-%{release}
+%endif
%description base
This package contains base files for Kazehakase.
@@ -188,9 +196,9 @@ This package uses WebKit for HTML render
%patch11 -p0 -b .rhbug
%patch14 -p1 -b .evr
%if 0%{?fedora} <= 11
-# Reverse!!
-%patch15 -p0 -b .gtk -R
+%patch15 -p1 -b .gtk
%endif
+%patch17 -p0 -b .libegg_mak
%if %{need_autogen}
sh autogen.sh
@@ -243,20 +251,31 @@ EOF
%build
export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
+rm -rf builddir ; mkdir builddir
+pushd builddir
+ln -sf ../configure
+
# --disable-shave is to make build.log more verbose
%configure \
+ --srcdir=$(pwd)/.. \
--disable-shave \
--enable-migemo \
+%if %{support_ruby} < 1
+ --with-ruby=no \
+%endif
--with-gecko-engine=libxul \
--disable-gtkmozembed
-%{__make} -C libegg -k # not parallel make
%{__make} %{?_smp_mflags} -k
+popd
%install
%{__rm} -rf $RPM_BUILD_ROOT
+
+pushd builddir
%{__make} install DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -c -p"
+popd
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.so
find $RPM_BUILD_ROOT%{_libdir}/%{name} -name \*.la | xargs %{__rm} -f
@@ -284,10 +303,13 @@ desktop-file-install \
%config(noreplace) %{_sysconfdir}/%{name}/mozilla/*.xml
%{_bindir}/%{name}
+%{_bindir}/kz-embed-process
%dir %{_libdir}/%{name}/
%dir %{_libdir}/%{name}/embed/
%dir %{_libdir}/%{name}/search/
+
%{_libdir}/%{name}/libkazehakase.so.*
+%{_libdir}/%{name}/embed/per_process.so
%dir %{_datadir}/%{name}/
%if %{support_ruby}
@@ -331,6 +353,9 @@ desktop-file-install \
%endif
%changelog
+* Tue Sep 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-1
+- Update to 0.5.8
+
* Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 0.5.7-2
- Rebuild against newer gecko
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources 29 Aug 2009 11:28:12 -0000 1.30
+++ sources 29 Sep 2009 15:33:06 -0000 1.31
@@ -1 +1 @@
-1f01892d8a0775c71a856d303a1e32bd kazehakase-0.5.7.tar.gz
+22d831982ebe010338907381caee8fdf kazehakase-0.5.8.tar.gz
--- kazehakase-0.5.7-gtk0218.patch DELETED ---
More information about the fedora-extras-commits
mailing list