SPECS: vte.spec - added link patch instead of LIBS hack - updated ...

qboosh qboosh at pld-linux.org
Sun Dec 10 12:28:39 CET 2006


Author: qboosh                       Date: Sun Dec 10 11:28:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added link patch instead of LIBS hack
- updated BRs, more verbose files

---- Files affected:
SPECS:
   vte.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/vte.spec
diff -u SPECS/vte.spec:1.107 SPECS/vte.spec:1.108
--- SPECS/vte.spec:1.107	Fri Oct  6 00:18:18 2006
+++ SPECS/vte.spec	Sun Dec 10 12:28:34 2006
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	glx # build for GLX support
+%bcond_with	glx	# drawing using GLX
 #
 Summary:	VTE terminal widget library
 Summary(pl):	Biblioteka z kontrolką terminala VTE
@@ -13,12 +13,15 @@
 Source0:	http://ftp.gnome.org/pub/gnome/sources/vte/0.14/%{name}-%{version}.tar.bz2
 # Source0-md5:	98ea2513b773b44cb7f8d75dc1aa312e
 Patch0:		%{name}-keys.patch
-%{?with_glx:BuildRequires:	OpenGL-devel}
-BuildRequires:	autoconf
-BuildRequires:	automake
+Patch1:		%{name}-link.patch
+%{?with_glx:BuildRequires:	OpenGL-GLU-devel}
+%{?with_glx:BuildRequires:	OpenGL-GLX-devel}
+BuildRequires:	autoconf >= 2.59-9
+BuildRequires:	automake >= 1.6
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 2:2.10.5
 BuildRequires:	gtk-doc
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libart_lgpl-devel >= 2.3.17
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
@@ -42,7 +45,7 @@
 Summary(pl):	Pliki nagłówkowe VTE
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-%{?with_glx:Requires:	OpenGL-devel}
+%{?with_glx:Requires:	OpenGL-GLU-devel}
 Requires:	gtk+2-devel >= 2:2.10.5
 Requires:	libart_lgpl-devel >= 2.3.17
 Requires:	ncurses-devel
@@ -103,6 +106,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -119,13 +123,12 @@
 %{__autoconf}
 cd ..
 %configure \
-	LIBS='-ltinfo' \
-	--with-xft2 \
-	--with-pangox \
-	%{?with_glx:--with-glX} \
-	--with-default-emulation=xterm \
 	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir}
+	--with-default-emulation=xterm \
+	%{?with_glx:--with-glX} \
+	--with-html-dir=%{_gtkdocdir} \
+	--with-pangox \
+	--with-xft2
 	
 %{__make}
 
@@ -147,9 +150,9 @@
 
 %files -f vte.lang
 %defattr(644,root,root,755)
-%doc NEWS README AUTHORS
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/vte
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libvte.so.*.*.*
 %dir %{_libdir}/vte
 %attr(755,root,root) %{_libdir}/vte/*
 %attr(2755,root,utmp) %{_libdir}/gnome-pty-helper
@@ -157,22 +160,22 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
-%{_pkgconfigdir}/*
+%attr(755,root,root) %{_libdir}/libvte.so
+%{_libdir}/libvte.la
+%{_includedir}/vte
+%{_pkgconfigdir}/vte.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libvte.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/*
+%{_gtkdocdir}/vte
 
 %files -n python-vte
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/gtk-2.0/*.so
+%attr(755,root,root) %{py_sitedir}/gtk-2.0/vtemodule.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -180,6 +183,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2006/12/10 11:28:34  qboosh
+- added link patch instead of LIBS hack
+- updated BRs, more verbose files
+
 Revision 1.107  2006/10/05 22:18:18  grzegol
 - package ug lang files (languages added in glibc-2.5)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vte.spec?r1=1.107&r2=1.108&f=u



More information about the pld-cvs-commit mailing list