- pl, partial cleanup, updated URL

Changed files:
    bogl.spec -> 1.3

diff --git a/bogl.spec b/bogl.spec
index c9951bda6ee619756def61b6492d75d66e5a8369..1a6eec422896df388378603ff3f0f2e0fef3d6bb 100644 (file)
--- a/bogl.spec
+++ b/bogl.spec
@@ -1,9 +1,11 @@
-Summary:       A terminal program for displaying Unicode on the console.
+Summary:       A terminal program for displaying Unicode on the console
+Summary(pl):   Program terminalowy do wy¶wietlania Unikodu na konsoli
 Name:          bogl
 Version:       0.1.18
 Release:       1
+Epoch:         0
 License:       GPL
-Group:         System Environment/Libraries
+Group:         Libraries
 Source0:       %{name}_%{version}-1.tar.gz
 # Source0-md5: 9658700ed196eb1789c12aca0a095cb5
 Source1:       wlite-0.8.1.tar.gz
@@ -19,36 +21,63 @@ Patch1:             bogl-0.1.9-fpic.patch
 Patch3:                bogl-0.1.9-2.6fbdev.patch
 Patch4:                bogl-0.1.18-gcc.patch
 Patch5:                bogl-0.1.18-noexecstack.patch
-URL:           http://www.msu.edu/user/pfaffben/projects.html
+URL:           http://www.stanford.edu/~blp/projects.html
 BuildRequires: gd-devel
 BuildRequires: libpng-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-BOGL stands for Ben's Own Graphics Library.  It is a small graphics
-library for Linux kernel frame buffers.  It supports only very simple
+BOGL stands for Ben's Own Graphics Library. It is a small graphics
+library for Linux kernel framebuffers. It supports only very simple
 graphics.
 
+%description -l pl
+BOGL oznacza Ben's Own Graphics Library (bibliotekê graficzn± Bena).
+Jest to ma³a biblioteka dla framebufferów j±dra Linuksa. Obs³uguje
+tylko bardzo prost± grafikê.
+
 %package devel
-Summary:       Development files required to build BOGL applications.
+Summary:       Development files required to build BOGL applications
+Summary(pl):   Pliki programistyczne potrzebne do budowania aplikacji BOGL
 Group:         Development/Libraries
-Requires:      bogl = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
-The bogl-devel package contains the static libraries and header files
-for writing BOGL applications.
+The bogl-devel package contains the header files for writing BOGL
+applications.
+
+%description devel -l pl
+Ten pakiet zawiera pliki nag³ówkowe do pisania aplikacji BOGL.
+
+%package static
+Summary:       Static BOGL libraries
+Summary(pl):   Statyczne biblioteki BOGL
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+
+%description static
+Static BOGL libraries.
+
+%description static -l pl
+Statyczne biblioteki BOGL.
 
 %package bterm
-Summary:       A Unicode capable terminal program for the Linux frame buffer.
+Summary:       A Unicode capable terminal program for the Linux framebuffer
+Summary(pl):   Obs³uguj±cy Unikod program terminalowy dla linuksowego framebuffera
 Group:         Applications/System
-Requires:      bogl = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description bterm
 The bterm application is a terminal emulator that displays to a Linux
-frame buffer.  It is able to display Unicode text on the console.
+framebuffer. It is able to display Unicode text on the console.
+
+%description bterm -l pl
+Aplikacja bterm to emulator terminala wy¶wietlaj±cy obraz na
+linuksowym framebufferze. Potrafi wy¶wietlaæ tekst unikodowy na
+konsoli.
 
 %prep
-%setup -q -n bogl -a 1
+%setup -q -n %{name} -a 1
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -61,35 +90,42 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE3}
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+%{__make} \
+       CFLAGS="%{rpmcflags}"
 #./mergebdf fonts/9x18.bdf fonts/18x18ja.bdf > font.bdf
 gunzip -c %{SOURCE4} > 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
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       libdir=%{_libdir}
+
+%{__make} -C wlite install \
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
+       libdir=$RPM_BUILD_ROOT%{_libdir}
+
 if [ -f wlite/libwlitediet.a ]; then
-    install -m 644 wlite/libwlitediet.a $RPM_BUILD_ROOT/%{_libdir}
+       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.bdf
-gzip -9 $RPM_BUILD_ROOT/usr/lib/bogl/font.bgf
+install -d $RPM_BUILD_ROOT%{_libdir}/bogl
+install font.bgf $RPM_BUILD_ROOT%{_libdir}/bogl
+install font.bdf $RPM_BUILD_ROOT%{_libdir}/bogl
+gzip -9n $RPM_BUILD_ROOT%{_libdir}/bogl/font.bdf
+gzip -9n $RPM_BUILD_ROOT%{_libdir}/bogl/font.bgf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc README
-%{_libdir}/*.so.*
+%attr(755,root,root) %{_libdir}/*.so.*
 
 %files devel
 %defattr(644,root,root,755)
@@ -97,17 +133,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mergebdf
 %attr(755,root,root) %{_bindir}/pngtobogl
 %attr(755,root,root) %{_bindir}/reduce-font
+%attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.a
-%{_libdir}/*.so
 %{_includedir}/bogl
 %{_includedir}/wlite*
 
+# static ??? or just static-only libwlitediet.a ?
+
 %files bterm
 %defattr(644,root,root,755)
 %doc README.BOGL-bterm
 %attr(755,root,root) %{_bindir}/bterm
+# XXX: dup dir
 %dir %{_datadir}/terminfo/b
 %{_datadir}/terminfo/b/bterm
 %{_libdir}/bogl
-
-%changelog