packages: elinks/elinks.spec - adapter friendly macros, file perms, file-cl...

[glen]

Author: glen                         Date: Fri Aug 27 13:44:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapter friendly macros, file perms, file-cleanup

---- Files affected:
packages/elinks:
   elinks.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: packages/elinks/elinks.spec
diff -u packages/elinks/elinks.spec:1.173 packages/elinks/elinks.spec:1.174
--- packages/elinks/elinks.spec:1.173	Wed Jun 16 22:59:25 2010
+++ packages/elinks/elinks.spec	Fri Aug 27 15:44:11 2010
@@ -22,23 +22,24 @@
 %bcond_without	lua		# Disable Lua scripting
 %bcond_without	openssl		# Disable OpenSSL support
 %bcond_without	perl		# Disable Perl scripting
-# 
+
 %if %{with gnutls}
 %undefine	with_openssl
 %endif
-#
-%define		pre	pre5
+
+%define		subver	pre5
+%define		rel		4
 Summary:	Experimantal Links (text WWW browser)
 Summary(es.UTF-8):	El links es un browser para modo texto, similar a lynx
 Summary(pl.UTF-8):	Eksperymentalny Links (tekstowa przeglądarka WWW)
 Summary(pt_BR.UTF-8):	O links é um browser para modo texto, similar ao lynx
 Name:		elinks
 Version:	0.12
-Release:	0.%{pre}.4
+Release:	0.%{subver}.%{rel}
 Epoch:		1
 License:	GPL v2
 Group:		Applications/Networking
-Source0:	http://www.elinks.cz/download/%{name}-%{version}%{pre}.tar.bz2
+Source0:	http://www.elinks.cz/download/%{name}-%{version}%{subver}.tar.bz2
 # Source0-md5:	92790144290131ac5e63b44548b45e08
 Source1:	%{name}.desktop
 Source2:	links.png
@@ -54,9 +55,9 @@
 BuildRequires:	expat-devel
 %{?with_fsp:BuildRequires:	fsplib-devel}
 BuildRequires:	gettext-devel
+%{?with_gnutls:BuildRequires:	gnutls-devel >= 1.2.5}
 BuildRequires:	gpm-devel
 %{?with_guile:BuildRequires: guile-devel}
-%{?with_gnutls:BuildRequires: gnutls-devel >= 1.2.5}
 %{?with_js:BuildRequires:	js-devel >= 1.5-0.rc6a.1}
 %{?with_idn:BuildRequires:	libidn-devel}
 %{?with_smb:BuildRequires:	libsmbclient-devel}
@@ -76,7 +77,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/elinks
-%define		specflags_ia32	-fomit-frame-pointer 
+%define		specflags_ia32	-fomit-frame-pointer
 
 %description
 This is the elinks tree - intended to provide feature-rich version of
@@ -100,7 +101,7 @@
 keepalive.
 
 %prep
-%setup -q -n %{name}-%{version}%{pre}
+%setup -q -n %{name}-%{version}%{subver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -155,8 +156,10 @@
 %{__make} install %{?with_verbose:V=1} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+rm $RPM_BUILD_ROOT%{_datadir}/locale/locale.alias
+
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %{?with_lua:install contrib/lua/*.lua $RPM_BUILD_ROOT%{_sysconfdir}}
 
@@ -186,6 +189,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2010/08/27 13:44:11  glen
+- adapter friendly macros, file perms, file-cleanup
+
 Revision 1.173  2010/06/16 20:59:25  qboosh
 - more verbose files, ac version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/elinks/elinks.spec?r1=1.173&r2=1.174&f=u