SPECS: fish.spec - added link patch instead of LIBS hack - fixed d...

qboosh qboosh at pld-linux.org
Sat Aug 25 15:46:40 CEST 2007


Author: qboosh                       Date: Sat Aug 25 13:46:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added link patch instead of LIBS hack
- fixed docs location (no junk in top-level /usr/share/doc)

---- Files affected:
SPECS:
   fish.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/fish.spec
diff -u SPECS/fish.spec:1.9 SPECS/fish.spec:1.10
--- SPECS/fish.spec:1.9	Wed Aug 22 18:58:02 2007
+++ SPECS/fish.spec	Sat Aug 25 15:46:35 2007
@@ -8,6 +8,7 @@
 Group:		Applications/Shells
 Source0:	http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	016a5944861ea48e363521c240834415
+Patch0:		%{name}-link.patch
 URL:		http://fishshell.org/
 BuildRequires:	autoconf
 BuildRequires:	doxygen
@@ -29,13 +30,14 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CFLAGS="-I/usr/include/ncurses"
 %{__autoconf}
 %{__autoheader}
 %configure \
-	LIBS="-ltinfo"
+	--docdir=/docs
 %{__make}
 
 %install
@@ -43,6 +45,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
+mv -f $RPM_BUILD_ROOT/docs docs
 
 %find_lang %{name}
 
@@ -51,16 +54,12 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
-%doc %{_docdir}/ChangeLog
-%doc %{_docdir}/*.css
-%doc %{_docdir}/*.html
-%doc %{_docdir}/*.png
-%doc %{_docdir}/*.gif
-
+%doc README docs/*
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fish
+%dir %{_sysconfdir}/fish
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fish/config.fish
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fish/fish_inputrc
 %{_mandir}/man1/*.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -69,6 +68,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/08/25 13:46:35  qboosh
+- added link patch instead of LIBS hack
+- fixed docs location (no junk in top-level /usr/share/doc)
+
 Revision 1.9  2007/08/22 16:58:02  aredridel
 - BR: autoconf, gettext-devel, xorg-lib-libXt-devel
 - R: man-whatis
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fish.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list