Browse Source

uim 1.8.6-6.gitc79432c

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11592 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 6 years ago
parent
commit
a4d941a942
1 changed files with 42 additions and 11 deletions
  1. 42 11
      u/uim/uim-vl.spec

+ 42 - 11
u/uim/uim-vl.spec

@@ -1,3 +1,11 @@
+%global commit c79432cb5aba3a67fb7e7557f4817c749865cc8a
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+%global sigscheme_commit cfcb6dd2ae93fd7b22b5e3a1403e2f0197602c79
+%global sigscheme_shortcommit %(c=%{sigscheme_commit}; echo ${c:0:7})
+
+%global libgcroots_commit 514c4fe1af59b39e2b4b68f0a3c55b8bf573b4dc
+%global libgcroots_shortcommit %(c=%{libgcroots_commit}; echo ${c:0:7})
 
 # build emacsen uim bridge ("--without emacs" to disable)
 %bcond_without emacsen
@@ -34,7 +42,7 @@ Name: uim
 Summary: Uim an input method library
 Summary(ja): 入力メソッドライブラリ
 Version: 1.8.6
-Release: 5%{?_dist_release}
+Release: 6.git%{shortcommit}%{?_dist_release}
 
 # pinyin-big5.scm and elatin-rules.scm are licensed under GPL
 License: BSD, LGPLv2 and GPL
@@ -44,16 +52,15 @@ URL: http://code.google.com/p/uim/
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source0: http://uim.googlecode.com/files/uim-%{version}%{?extraver:-%extraver}.tar.bz2
+#Source0: http://uim.googlecode.com/files/uim-%{version}%{?extraver:-%extraver}.tar.bz2
+Source0: https://github.com/uim/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 Source1: uim-el-install.sh
 Source2: uim-el-remove.sh
 Source3: uim-update-installed-modules.sh.in
 Source4: vine-default-uim-el.el
 Source5: uim-el-init.el
-
-# fix the issue that conversion candidates are not displayed
-# http://garakuta.homelinux.org/~nosuke/diary/diary.html?y=2016&m=2&d=13&n=1
-Patch1: uim-gtk2_immodule_uim-cand-win-gtk.c.patch
+Source6: https://github.com/uim/sigscheme/archive/cfcb6dd2ae93fd7b22b5e3a1403e2f0197602c79/sigscheme-cfcb6dd.tar.gz
+Source7: https://github.com/uim/libgcroots/archive/%{libgcroots_commit}/libgcroots-%{libgcroots_shortcommit}.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libXft-devel libX11-devel libXext-devel 
@@ -87,6 +94,8 @@ BuildRequires: mana
 %if %{with emacsen}
 BuildRequires: emacs
 %endif
+# for Git
+BuildRequires: librsvg2, ruby, perl, asciidoc
 
 BuildConflicts: uim-devel < 1.4.0
 Requires(post): coreutils, grep, sed
@@ -367,8 +376,13 @@ uim-devel パッケージには libuim を利用したアプリケーション
 するためのヘッダファイルとライブラリが含まれています。
 
 %prep
-%setup -q -n %{name}-%{version}%{?extraver:-%extraver}
-%patch1
+#%setup -q -n %{name}-%{version}%{?extraver:-%extraver}
+%setup -q -a 6 -a 7 -n %{name}-%{commit}
+# for Git
+%{__rm} -rf sigscheme
+%{__mv} sigscheme-%{sigscheme_commit} sigscheme
+%{__rm} -rf sigscheme/libgcroots
+%{__mv} libgcroots-%{libgcroots_commit} sigscheme/libgcroots
 
 %build
 %if %{with qt3}
@@ -376,6 +390,13 @@ unset QTDIR
 export QTDIR=%{_qt3_prefix}
 %endif
 
+pushd sigscheme/libgcroots
+./autogen.sh
+popd
+pushd sigscheme
+./autogen.sh
+popd
+./autogen.sh
 %configure --with-x --with-xft \
 	--with-anthy --with-anthy-utf8 \
 	--without-scim --without-prime \
@@ -387,6 +408,7 @@ export QTDIR=%{_qt3_prefix}
 	--with-ffi \
 	--with-eb --with-eb-conf=%{_sysconfdir}/eb.conf \
 	--disable-static \
+        --enable-maintainer-mode \
 %if %{with gnome}
 	--enable-gnome3-applet \
 %else
@@ -427,8 +449,9 @@ export QTDIR=%{_qt3_prefix}
 	--without-mana 
 %endif
 
-sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs:$LD_LIBRARY_PATH make
+#sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
+#LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs:$LD_LIBRARY_PATH make
+make %{_smp_mflags}
 
 %install
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
@@ -495,7 +518,7 @@ make install DESTDIR=%{buildroot}
 rm -rf installed-doc
 mkdir -p installed-doc/sigscheme
 cp -p sigscheme/doc/*.txt installed-doc/sigscheme
-cp -p sigscheme/doc/*.html installed-doc/sigscheme
+#cp -p sigscheme/doc/*.html installed-doc/sigscheme
 
 # script to register prefered engine
 %__cat %{SOURCE3} \
@@ -774,11 +797,19 @@ fi
 %defattr(-,root,root)
 %doc doc/PLUGIN installed-doc/sigscheme
 %{_libdir}/*.so
+%{_libdir}/uim/plugin/*.so
 %{_includedir}/*.h
 %{_includedir}/uim
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sat Mar 24 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 1.8.6-6.gitc79432c
+- update to current Git master
+ - add BuildRequires: librsvg2
+ - add BuildRequres: perl, ruby, asciidoc
+ - add '--enable-maintainer-mode'
+- drop Patch1: upstream fixed (#76)
+
 * Thu Dec 14 2017 Toshiaki Ara <ara_t@384.jp> 1.8.6-5
 - add Patch1 (uim-gtk2_immodule_uim-cand-win-gtk.c.patch)
   - fix the issue that conversion candidates are not displayed