2015-01-11 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* libXaw3dXft: updated
	* xbill: built with libXaw3dXft
	* xfig: added xft patch
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9247 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libXaw3dXft/libXaw3dXft-vl.spec → lib/libX/libXaw3dXft/libXaw3dXft-vl.spec

@@ -2,11 +2,15 @@
 # Basic Information
 Name:		libXaw3dXft
 Summary:	X 3D Athena Widgets Library with Xft
-Version:	1.6.2c
+Version:	1.6.2d
-Release:	2%{?_dist_release}
+Release:	1%{?_dist_release}
 License:	MIT
 Group:		System Environment/Libraries
+
 Source0:	%{name}-%{version}.tar.bz2
+Patch7:         Xaw3d-1.6.1-3Dlabel.patch
+Patch10:        Xaw3d-1.6.1-fontset.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Vendor:		Project Vine
@@ -16,8 +20,10 @@ Packager:	yasumichi
 # Dependency
 Requires:	libXft
 Requires:	libXmu
+Requires:	libXpm
 BuildRequires:	libXft-devel
 BuildRequires:	libXmu-devel
+BuildRequires:	libXpm-devel
 
 %package devel
 Summary:	Development tools for programs which will use the libXaw3dXft library.
@@ -26,6 +32,7 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libXft-devel
 Requires:	libXmu-devel
+Requires:	libXpm-devel
 
 %description
 X 3D Athena Widgets Library with Xft
@@ -35,16 +42,23 @@ Development tools for programs which will use the libXaw3dXft library.
 
 %prep
 %setup -q
+%patch7 -p1 -b .3Dlabel
+%patch10 -p1 -b .fontset
 
 %build
-%configure --enable-internationalization --enable-arrow-scrollbars
+%configure \
+    --disable-static \
+    --enable-internationalization \
+    --enable-arrow-scrollbars \
+    --enable-gray-stipples \
+    --enable-multiplane-bitmaps
+
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
-%{__rm} ${RPM_BUILD_ROOT}%{_libdir}/libXaw3dxft.a
 %{__rm} ${RPM_BUILD_ROOT}%{_libdir}/libXaw3dxft.la
 
 
@@ -69,6 +83,11 @@ Development tools for programs which will use the libXaw3dXft library.
 %{_docdir}/%{name}/README.XAW3D
 
 %changelog
+* Tue Jan  6 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.6.2d-1
+- new upstream release
+- enabled multiplane-bitmaps and gray-stipples
+- added Patch7 and Patch10 from Fedora
+
 * Sun Oct 05 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.6.2c-2
 - moved main package to System Environment/Libraries Group
 - added %%post and %%postun section

x/xbill/xbill-vl.spec

@@ -2,7 +2,7 @@ Summary: Get rid of those Wingdows Viruses!
 Summary(ja): Wingdows ウィルスを撲滅しよう!
 Name: xbill
 Version: 2.1
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 
 License: GPLv2
 Group: Applications/Games
@@ -11,15 +11,14 @@ URL: http://www.xbill.org/
 Source: ftp://ftp.xbill.org/pub/xbill/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.png
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libXaw3dXft-devel
+BuildRequires: libXpm-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Requires: gtk+
-BuildRequires: gtk+-devel
-#BuildRequires: Xaw3d-devel
-
 %description
 Ever get the feeling that nothing is going right? You're a sysadmin,
 and someone's trying to destroy your computers. The little people
@@ -44,8 +43,17 @@ OS そっくりににせた Wingdows (TM) ウィルスに感染させようと
 %setup -q
 
 %build
-./configure --prefix=%{_prefix} --localstatedir=/var/lib/games --disable-motif
+# fixed for building with libXaw3dxft
-make
+sed -i -e 's|Xaw3d|Xaw3dxft|g' configure
+sed -i -e 's|X11/Xaw/|X11/Xaw3dxft/|g' x11-athena.c
+
+LIBS="-lXpm" ./configure \
+    --prefix=%{_prefix} \
+    --localstatedir=/var/lib/games \
+    --disable-motif \
+    --enable-athena \
+    --disable-gtk
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jan  7 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.1-6
+- linked to libXaw3dxft
+- rebuilt with current VineSeed
+
 * Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.1-5
 - rebuilt with current VineSeed
 

x/xfig/xfig-vl.spec

@@ -4,7 +4,7 @@
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
 Version: 3.2.5c
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT
 Group: Applications/Graphics
 URL: http://www.xfig.org/
@@ -26,6 +26,10 @@ Patch7: 39_add_xfig_man_html.patch
 Patch8: 40_fix_dash_list_for_different_styles.patch
 Patch9: xfig-3.2.5-rhbz1046102.patch
 
+# patches for libXaw3dxft from http://sourceforge.net/projects/sf-xpaint/files/xaw3dxft-progs/
+# modified by deleting debian-related patch
+Patch100: xfig-xft.patch.bz2
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: desktop-file-utils
 BuildRequires: freetype2-devel
@@ -60,11 +64,6 @@ PostScript, LaTeX).
 %setup -q -n xfig.%{version} -a 1 
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .Imakefile
-#patch7 -p1 -b .modularX
-#patch9 -p1 -b .Xaw3d
-#patch10 -p1 -b .no-Xaw3d
-#patch13 -p1 -b .urw
-#patch19 -p1
 %patch3 -p1 -b .urw
 %patch4 -p1
 %patch5 -p1
@@ -73,15 +72,15 @@ PostScript, LaTeX).
 %patch8 -p1
 %patch9 -p1
 
+%patch100 -p1 -b .xft
+# above patch is not enough
+sed -i -e 's|X11/Xaw3d/|X11/Xaw3dxft/|g' w_listwidget.c
+sed -i -e 's|X11/Xaw3d/|X11/Xaw3dxft/|g' SmeCascade.h
+
 iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES
 rm Doc/html/images/sav1a0.tmp
 chmod -x `find -type f`
 
-# fix for building libXaw3dXft
-sed -i 's/X11\/Xaw3d\//X11\/Xaw3dxft\//' *.h *.c
-sed -i 's/-lXaw3d/-lXaw3dxft/' Imakefile
-
-
 %build
 xmkmf
 make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
@@ -143,6 +142,9 @@ fi
 
 
 %changelog
+* Sun Jan 11 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.5c-2
+- added Patch100
+
 * Sat Oct 11 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.5c-1
 - updated to 3.2.5c
 - updated Source1