Browse Source

rebuild with libgsf-1.14.22

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5339 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 12 years ago
parent
commit
5cf5772a8e
2 changed files with 19 additions and 7 deletions
  1. 10 5
      a/abiword/abiword-vl.spec
  2. 9 2
      g/gnumeric/gnumeric-vl.spec

+ 10 - 5
a/abiword/abiword-vl.spec

@@ -5,7 +5,7 @@ Summary: The AbiWord word processor
 Summary(ja): AbiWord ワードプロセッサ
 Name: abiword
 Version: 2.8.6
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Epoch: 1
 Group: Applications/Productivity
 License: GPLv2+
@@ -22,6 +22,8 @@ Distribution: Vine Linux
 #Packager:
 
 # for abiword
+BuildRequires: flex
+BuildRequires: bison
 BuildRequires: gcc-c++
 BuildRequires: gtk2-devel
 BuildRequires: libpng-devel
@@ -61,7 +63,8 @@ URL: http://www.abisource.com/
 Patch0: abiword-2.6.0-windowshelppaths.patch
 Patch1: abiword-2.6.4-desktop.patch
 Patch2: abiword-2.6.0-boolean.patch
-Patch3: abiword-plugins-2.6.0-boolean.patch
+Patch3: abiword-2.8.6-no-undefined.patch
+
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -99,9 +102,7 @@ libabiword で開発するためのインクルードファイル及び定義フ
 ## %patch1 -p1 -b .desktop
 %patch2 -p1 -b .boolean
 
-# setup abiword-plugins
-## %setup -q -T -b 1 -n abiword-plugins-%{version}
-## %patch3 -p1 -b .boolean
+%patch3 -p1 -b .undefined
 
 # setup abiword extras
 ## %setup -q -T -b 2 -n abiword-extras-%{version}
@@ -223,6 +224,10 @@ update-desktop-database -q %{_datadir}/applications
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Dec 30 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:2.8.6-4
+- add Patch3 (abiword-2.8.6-no-undefined.patch)
+- add BuildRequires: flex, bison
+
 * Wed Oct 06 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:2.8.6-3
 - rebuild with poppler-0.14.2
 

+ 9 - 2
g/gnumeric/gnumeric-vl.spec

@@ -5,7 +5,7 @@ Summary:     A spreadsheet program for GNOME.
 Summary(ja): GNOME スプレッドシート
 Name: 	     gnumeric
 Version:     1.10.17
-Release:     1%{?_dist_release}
+Release:     2%{?_dist_release}
 License:     GPLv2
 Group: 	     Applications/Productivity
 
@@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 # default font: VL Gothic
 Patch0:	gnumeric-1.10.17-vlgothic.patch
 
+Patch1: gnumeric-1.10.17-libgsf.patch
+
 Distribution: Vine Linux
 Vendor: Project Vine
 
@@ -80,7 +82,8 @@ MS Excelファイルや他の多くのフォーマット(csv, latex, xbase, appl
 
 %prep
 %setup -q
-%patch0 -p1 -b vlgothic
+%patch0 -p1 -b .vlgothic
+%patch1 -p1 -b .libgsf
 
 %build
 %ifarch alpha
@@ -194,6 +197,10 @@ fi
 
 
 %changelog
+* Fri Dec 30 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.17-2
+- rebuild with libgsf-1.14.22
+- add Patch1 (gnumeric-1.10.17-libgsf.patch)
+
 * Wed Aug 03 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.17-1
 - new upstream release
 - update Patch0