X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gfontview.spec;h=6ff6bd667155fac3422c9a209fa032c34aa7ced1;hb=f06c901525af42b51e543f58626103d83584459e;hp=ef44bc70066ab07d7984a55f756df4d9bbf28f8e;hpb=ce8a0df436a51683589436c6c9e43b62ffdeff55;p=packages%2Fgfontview.git

diff --git a/gfontview.spec b/gfontview.spec
index ef44bc7..6ff6bd6 100644
--- a/gfontview.spec
+++ b/gfontview.spec
@@ -1,27 +1,33 @@
+#
+# Conditional build:
+%bcond_with	gnome1	# with GNOME (1.x) support
+#
 Summary:	A font viewer for Type 1 and TrueType fonts
 Summary(pl):	Przegl±darka czcionek Type 1 i TrueType
 Name:		gfontview
 Version:	0.5.0
-Release:	2
+Release:	7
 License:	GPL
 Group:		X11/Applications
-Source0:	ftp://download.sourceforge.net/pub/sourceforge/gfontview/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/gfontview/%{name}-%{version}.tar.gz
+# Source0-md5:	f06e0e9d67f7d8b3af251fa593e83eeb
 Source1:	%{name}.desktop
 Patch0:		%{name}-autoconf.patch
+Patch1:		%{name}-gcc33.patch
+Patch2:		%{name}-po.patch
 Icon:		gfontview.xpm
 URL:		http://gfontview.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	freetype1-devel
 BuildRequires:	gettext-devel
+%{?with_gnome1:BuildRequires:	gnome-libs-devel}
 BuildRequires:	gtk+-devel >= 1.2.6
-BuildRequires:	libungif-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libungif-devel
 BuildRequires:	t1lib-devel >= 1.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define 	_prefix		/usr/X11R6
-
 %description
 gfontview is a Font Viewer for outline fonts (PostScript Type 1 and
 TrueType). It displays all fonts present in the chosen directory in a
@@ -38,7 +44,7 @@ gfontview jest przegl
 Wy¶wietla listê wszystkich czcionek z wybranego katalogu i umo¿liwia
 podgl±d ka¿dej z nich zarówno w g³ównym oknie programu, jak i w
 oddzielnych oknach. Posiada mo¿liwo¶æ wyg³adzania czcionek
-(antialiasing), drukowania przyk³adów kroju w postaci pojedyñczych
+(antialiasing), drukowania przyk³adów kroju w postaci pojedynczych
 znaków, linii jak równie¿ wiêkszych partii tekstu, co pozwala na
 zorientowanie siê, jak wygl±da ca³a strona z wykorzystaniem wybranej
 czcionki. Program umo¿liwia tak¿e zapisanie znaku lub fragmentu tekstu
@@ -46,29 +52,35 @@ w formacie GIF.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
-aclocal -I .
-%{__automake}
+%{__aclocal} -I .
 %{__autoconf}
-autoheader
+%{__autoheader}
+%{__automake}
 CXXFLAGS="%{rpmcflags} -I/usr/include/freetype \
 	-fno-rtti -fno-exceptions -fno-implicit-templates"
 %configure \
+	SPOOLER="/usr/bin/lpr" \
 	--with-libungif \
-	--with-fontdir=/usr/share/fonts/Type1
+	--with-fontdir=/usr/share/fonts/Type1 \
+	%{!?with_gnome1:--disable-gnome}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/misc,%{_applnkdir}/Utilities}
+install -d $RPM_BUILD_ROOT{%{_datadir}/misc,%{_desktopdir}}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install gfontviewrc $RPM_BUILD_ROOT%{_datadir}/misc/gfontviewrc
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %find_lang %{name}
 
@@ -79,6 +91,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README ChangeLog AUTHORS NEWS TODO
 %attr(755,root,root) %{_bindir}/gfontview
-
-%config(noreplace) %verify(not size mtime md5) %{_datadir}/misc/gfontviewrc
-%{_applnkdir}/Utilities/gfontview.desktop
+%config(noreplace) %verify(not md5 mtime size) %{_datadir}/misc/gfontviewrc
+%{_desktopdir}/gfontview.desktop
+%{_pixmapsdir}/gfontview.png