SPECS (AC-branch): xfprint.spec - 4.2.3, HEAD merge - intltoolize ...

[havner]

Author: havner                       Date: Wed Jul  5 15:03:14 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 4.2.3, HEAD merge
- intltoolize before glib_gettextize

---- Files affected:
SPECS:
   xfprint.spec (1.30 -> 1.30.2.1) 

---- Diffs:

================================================================
Index: SPECS/xfprint.spec
diff -u SPECS/xfprint.spec:1.30 SPECS/xfprint.spec:1.30.2.1
--- SPECS/xfprint.spec:1.30	Wed Mar 16 21:32:19 2005
+++ SPECS/xfprint.spec	Wed Jul  5 17:03:09 2006
@@ -2,12 +2,12 @@
 Summary:	Print dialog and printer manager for Xfce
 Summary(pl):	Okno dialogowe wydruku i zarządca drukarek dla Xfce
 Name:		xfprint
-Version:	4.2.1
+Version:	4.2.3
 Release:	1
 License:	BSD
 Group:		X11/Applications
-Source0:        http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	da40a8881566880b166a9b91a70ef8c9
+Source0:	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
+# Source0-md5:	64c983a6d7778cbd5d6c93ee1dbbd3f9
 Patch0:		%{name}-locale-names.patch
 Patch1:		%{name}-lpr.patch
 URL:		http://www.xfce.org/
@@ -19,14 +19,16 @@
 BuildRequires:	glib2-devel >= 2.2.0
 BuildRequires:	intltool
 BuildRequires:	libtool
-BuildRequires:	libxfce4mcs-devel >= 4.1.91
-BuildRequires:	libxfcegui4-devel >= 4.1.91
+BuildRequires:	libxfce4mcs-devel >= 4.2.0
+BuildRequires:	libxfcegui4-devel >= 4.2.0
+BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	xfce-mcs-manager-devel >= 4.1.91
+BuildRequires:	xfce-mcs-manager-devel >= 4.2.0
+BuildRequires:	xfce4-dev-tools
 Requires:	%{name}-print-backend = %{version}-%{release}
 Requires:	a2ps
 Requires:	glib2 >= 2.2.0
-Requires:	libxfcegui4 >= 4.1.91
+Requires:	libxfcegui4 >= 4.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,19 +40,19 @@
 środowiska Xfce.
 
 %package cups
-Summary:	cups plugin for xfprint
-Summary(pl):	Wtyczka cups dla xfprint
+Summary:	CUPS plugin for xfprint
+Summary(pl):	Wtyczka CUPS dla xfprint
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-print-backend = %{version}-%{release}
 
 %description cups
-This package contains plugin for xfprint allowing to use cups printing
+This package contains plugin for xfprint allowing to use CUPS printing
 system directly.
 
 %description cups -l pl
-Paczka ta zawiera wtyczke dla xfprint, ktora umozliwia bezposrednie
-korzystanie z systemu wydruku cups.
+Paczka ta zawiera wtyczkę dla xfprint, która umożliwia bezpośrednie
+korzystanie z systemu wydruku CUPS.
 
 %package bsdlpr
 Summary:	bsdlpr plugin for xfprint
@@ -65,7 +67,7 @@
 style printing system through lpr program.
 
 %description bsdlpr -l pl
-Paczka ta zawiera wtyczke dla xfprint, ktora umozliwia drukowanie
+Paczka ta zawiera wtyczkę dla xfprint, która umożliwia drukowanie
 w stylu bsd poprzez program lpr.
 
 %prep
@@ -76,14 +78,15 @@
 mv -f po/{pt_PT,pt}.po
 
 %build
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__intltoolize}
+%{__glib_gettextize}
 %{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-static \
 	--enable-cups \
 	--enable-bsdlpr
 
@@ -96,8 +99,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # unusable (no devel resources)
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/xfprint-plugins/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/xfprint-plugins/*.la
 
 %find_lang %{name}
 
@@ -114,8 +117,9 @@
 %attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
 %{_iconsdir}/hicolor/*/*/*
 %{_desktopdir}/*
-%{_datadir}/xfce4/doc/C/xfprint.html
-%{_datadir}/xfce4/doc/C/images/*.png
+%{_datadir}/xfce4/doc/C/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(he) %{_datadir}/xfce4/doc/he/*
 
 %files cups
 %defattr(644,root,root,755)
@@ -131,6 +135,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30.2.1  2006/07/05 15:03:09  havner
+- 4.2.3, HEAD merge
+- intltoolize before glib_gettextize
+
+Revision 1.33  2006/04/20 09:33:53  ankry
+- tab
+
+Revision 1.32  2005/11/13 01:23:40  charles
+- updated to 4.2.3
+- updated BRs, fixed desc
+
+Revision 1.31  2005/05/22 22:25:21  koorek
+- updated to 4.2.2
+- used m4macros from dev-tools
+- added fr lang docs - yes, %lang(fr)
+
 Revision 1.30  2005/03/16 20:32:19  qboosh
 - strict deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfprint.spec?r1=1.30&r2=1.30.2.1&f=u