rpms/w3m/devel w3m.spec,1.37,1.38
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 26 07:24:54 UTC 2007
- Previous message (by thread): rpms/fonts-indic/devel .cvsignore, 1.19, 1.20 fonts-indic.spec, 1.26, 1.27 sources, 1.23, 1.24
- Next message (by thread): rpms/system-config-date/devel .cvsignore, 1.54, 1.55 sources, 1.58, 1.59 system-config-date.spec, 1.63, 1.64
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pnemade
Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20573
Modified Files:
w3m.spec
Log Message:
SPEC file Changes as part of Merge Review
Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- w3m.spec 26 Feb 2007 04:54:58 -0000 1.37
+++ w3m.spec 26 Mar 2007 07:24:52 -0000 1.38
@@ -4,7 +4,7 @@
Name: w3m
Version: 0.5.1
-Release: 17%{?dist}
+Release: 18%{?dist}
License: BSD
URL: http://w3m.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +19,7 @@
%endif
## re-compressed bzip2 instead of gzip
-Source0: http://download.sourceforge.net/w3m/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/w3m/%{name}-%{version}.tar.gz
Source10: w3mconfig
@@ -40,8 +40,7 @@
Summary: A pager with Web browsing abilities
Group: Applications/Internet
-Requires: perl, openssl
-Provides: webclient = 0.5.1
+Provides: webclient
%description
The w3m program is a pager (or text file viewer) that can also be used
@@ -67,9 +66,9 @@
linux framebuffer.
%prep
-%setup -q
-chmod 755 %{_builddir}/w3m-0.5.1/doc
-chmod 755 %{_builddir}/w3m-0.5.1/doc-jp
+%setup -q -a 20
+chmod 755 doc
+chmod 755 doc-jp
%patch15 -p1
%patch16 -p1
@@ -82,13 +81,11 @@
%endif
%patch25 -p1
-rm -rf gc
-tar xfz %{SOURCE20}
mv %{gcversion} gc
%build
pushd gc
-make gc.a
+make gc.a ABI_FLAG="$RPM_OPT_FLAGS"
mkdir lib
ln -s ../gc.a lib/libgc.a
popd
@@ -100,41 +97,39 @@
%{?_without_gopher:--disable-gopher} \
%{!?_without_gopher:--enable-gopher} \
%{?_without_image:--disable-image} \
- %{!?_without_image:--enable-image --with-imagelib=gtk2} \
+ %{!?_without_image:--enable-image=x11,fb --with-imagelib=gtk2} \
%{?_with_lynx_keymap:--enable-keymap=lynx} \
%{!?_with_lynx_keymap:--enable-keymap=w3m}
%{__make} # %{?_smp_mflags}
%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/w3m
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/w3m/config
+install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/w3m/config
%{!?_without_utf8:for i in $RPM_BUILD_ROOT%{_mandir}/ja/man*/*; do (if [ "x$i" = "x$i.gz" ]; then zcat $i; else cat $i; fi) | iconv -f euc-jp -t utf-8 | gzip -9c > $i.new && (rm -f $i && mv $i.new ${i//.gz}.gz || :) || rm -f $i.new; done}
%find_lang w3m
-find $RPM_BUILD_ROOT%{_libexecdir} -type f -print | grep -v w3mimgdisplay | sed -e "s,$RPM_BUILD_ROOT,," >> w3m.lang
-
%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files -f w3m.lang
%defattr(-, root, root, -)
-%doc doc doc-jp
+%doc doc
+%lang(ja) %doc doc-jp
## %doc README.img
-%{_datadir}/w3m
-%config(noreplace) %{_sysconfdir}/w3m
+%{_datadir}/w3m/
+%config(noreplace) %{_sysconfdir}/w3m/
%{_bindir}/w3m*
-%{_mandir}/ja/man1/w3m.1*
+%lang(ja) %{_mandir}/ja/man1/w3m.1*
%{_mandir}/man1/w3m.1*
%{_mandir}/man1/w3mman.1*
-%dir %{_libexecdir}/%{name}
-%dir %{_libexecdir}/%{name}/cgi-bin
+%{_libexecdir}/w3m/
%exclude %{_libexecdir}/w3m/w3mimgdisplay
%files img
@@ -142,6 +137,9 @@
%{_libexecdir}/w3m/w3mimgdisplay
%changelog
+* Mon Mar 26 2007 Parag Nemade <pnemade at redhat.com> - 0.5.1-18
+- spec file cleanup.
+
* Mon Feb 26 2007 Parag Nemade <pnemade at redhat.com> - 0.5.1-17
- Resolves #229799
- Previous message (by thread): rpms/fonts-indic/devel .cvsignore, 1.19, 1.20 fonts-indic.spec, 1.26, 1.27 sources, 1.23, 1.24
- Next message (by thread): rpms/system-config-date/devel .cvsignore, 1.54, 1.55 sources, 1.58, 1.59 system-config-date.spec, 1.63, 1.64
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list