Browse Source

bogl:
- update patches to sync with fedora package
- move bogl font to %%{_datadir}
- drop wlite



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

daisuke 13 years ago
parent
commit
3655a11ee8
1 changed files with 38 additions and 27 deletions
  1. 38 27
      b/bogl/bogl-vl.spec

+ 38 - 27
b/bogl/bogl-vl.spec

@@ -1,18 +1,23 @@
 Summary: A terminal program for displaying Unicode on the console.
 Summary(ja): コンソール上でユニコードを表示するためのターミナルプログラム
 Name: bogl
+Epoch: 0
 Version: 0.1.18
-Release: 10%{?_dist_release}
+Release: 11%{?_dist_release}
 URL: http://www.msu.edu/user/pfaffben/projects.html
+
 Source0: http://ftp.debian.org/debian/pool/main/b/bogl/bogl_0.1.18-1.5.tar.gz
-Source1: wlite-0.8.1.tar.gz
-Source4: 14x14cjk.bdf.gz
-Patch: bogl-0.1.18-1.5-vine.patch
-Patch1: bogl-0.1.9-fpic.patch
-Patch3: bogl-0.1.9-2.6fbdev.patch
-Patch5: bogl-0.1.18-noexecstack.patch
-Epoch: 0
-License: GPL
+Source1: 14x14cjk.bdf.gz
+Patch0: bogl-0.1.18-1.1.sigchld.patch
+Patch1: bogl-0.1.18-1.2.reduce-font.patch
+Patch2: bogl-0.1.18-1.2.gzip-fonts.patch
+Patch3: bogl-0.1.18-1.2.term.patch
+Patch4: bogl-0.1.18-1.5.rh.patch
+Patch5: bogl-0.1.9-2.6fbdev.patch
+Patch6: bogl-0.1.18-noexecstack.patch
+Patch10: bogl-0.1.18-vine.patch
+
+License: GPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: gd-devel, libpng-devel
@@ -41,29 +46,31 @@ The bterm application is a terminal emulator that displays to a Linux
 frame buffer.  It is able to display Unicode text on the console.
 
 %prep
-%setup -q -a 1
-%patch -p1 -b .rh
-%patch1 -p1 -b .fpic
-%patch3 -p1 -b .26fbdev
-%patch5 -p1 -b .noexecstack
+%setup -q
+%patch0 -p1 -b .sigchld
+%patch1 -p1 -b .reduce-font
+%patch2 -p1 -b .gzip-fonts
+%patch3 -p1 -b .term
+%patch4 -p1 -b .rh
+%patch5 -p1 -b .26fbdev
+%patch6 -p1 -b .noexecstack
+%patch10 -p1 -b .vine
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
-gunzip -c %{SOURCE4} > font.bdf
+gunzip -c %{SOURCE1} > font.bdf
 ./bdftobogl -b font.bdf > font.bgf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} install
-make -C wlite prefix=$RPM_BUILD_ROOT/%{_prefix} libdir=$RPM_BUILD_ROOT/%{_libdir} install
-if [ -f wlite/libwlitediet.a ]; then
-    install -m 644 wlite/libwlitediet.a $RPM_BUILD_ROOT/%{_libdir}
-fi
-mkdir -p $RPM_BUILD_ROOT/usr/lib/bogl/
-cp font.bgf $RPM_BUILD_ROOT/usr/lib/bogl/
-cp font.bdf $RPM_BUILD_ROOT/usr/lib/bogl/
-gzip -9 $RPM_BUILD_ROOT/usr/lib/bogl/font.bgf
-gzip -9 $RPM_BUILD_ROOT/usr/lib/bogl/font.bdf
+make CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} install
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/bogl/
+cp font.bgf $RPM_BUILD_ROOT%{_datadir}/bogl/
+cp font.bdf $RPM_BUILD_ROOT%{_datadir}/bogl/
+gzip -9 $RPM_BUILD_ROOT%{_datadir}/bogl/font.bgf
+gzip -9 $RPM_BUILD_ROOT%{_datadir}/bogl/font.bdf
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,7 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/bogl
-%{_includedir}/wlite*
 
 %files bterm
 %defattr(-,root,root)
@@ -94,9 +100,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/bterm
 %dir %{_datadir}/terminfo/b
 %{_datadir}/terminfo/b/bterm
-/usr/lib/bogl
+%{_datadir}/bogl
 
 %changelog
+* Wed Jun 01 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.1.18-11
+- update patches to sync with fedora package
+- move bogl font to %%{_datadir}
+- drop wlite
+
 * Sun Apr 17 2011 Shu KONNO <owa@bg.wakwak.com> 0.1.18-10
 - rebuilt with rpm-4.8.1-3