fish.spec
Jacek 'jackass' Brzozowski
metallowiec at op.pl
Sun Apr 10 18:59:55 CEST 2005
Użytkownik Adam Gołębiowski napisał:
>On Sun, Apr 10, 2005 at 03:41:22PM +0200, Jacek 'jackass' Brzozowski wrote:
>
>
>>Witam
>>Dorzucam nowego speca
>>
>>
>
>Parę uwag:
>
>
>
>># $Revision: 1.30 $, $Date: 2004/12/16 13:01:38 $
>>Summary: fish - A friendly interactive shell
>>Summary(pl): fish - przyjazna interaktywna pow?oka
>>
>>
>
>pliterki tylko u mnie rozjechane?
>
>
>
>>BuildRequires: autoconf
>>BuildRequires: automake
>>BuildRequires: ncurses-devel
>>BuildRequires: doxygen
>>
>>
>
>Sortujemy buildrequires
>
>
>
>>%prep
>>%setup -q
>>%patch0 -p1
>>find -name "Makefile.in" -exec \
>> sed -i -e "s at -o 0 -g 0@@" \
>> -e "s@/usr/local/@/usr/@" \
>> "{}" ";" \
>>
>>find -name "configure" -exec \
>> sed -i -e "s@/usr/local/@/usr/@" \
>> "{}" ";"
>>
>>
>
>nie zamieniamy na '/usr/' a na %{_prefix}. poza tym, to chyba lepiej
>spatchować?
>
>
>
>>%build
>>#%{__aclocal}
>>#%{__autoconf}
>>#%{__autoheader}
>>#%{__automake}
>>
>>
>
>Jeśli niepotrzebne to usuwamy. A swoją drogą, poprawne zakmentowanie
>tego powinno wyglądać nastęująco:
>#%%{__aclocal}
>tu akurat różnicy nie robi, ale w %configure już tak (makro %foo w
>'#%foo' jest ciagle rozwijane).
>
>
>
>>%configure
>>%{__make}
>>%install
>>
>>
>
>pusta linia by się przydała
>
>
>
>>rm -rf $RPM_BUILD_ROOT
>>install -d $RPM_BUILD_ROOT%{_prefix}/man/man1
>>install -d $RPM_BUILD_ROOT/%{_mandir}/man1
>>
>>
>
>zbędny '/'.
>
>
>>%{__make} install \
>> DESTDIR=$RPM_BUILD_ROOT
>>
>>mv -f $RPM_BUILD_ROOT%{_prefix}/man/man1/*.1* $RPM_BUILD_ROOT/%{_mandir}/man1/
>>
>>
>
>i znów
>
>
>
>>--- fish-1.6/input.c.orig 2005-04-10 11:41:14.819977912 +0200
>>+++ fish-1.6/input.c 2005-04-10 11:42:36.639539448 +0200
>>@@ -28,9 +28,9 @@
>> #include <sys/ioctl.h>
>> #include <unistd.h>
>> #if HAVE_NCURSES_H
>>-#include <ncurses.h>
>>+#include <ncurses/ncurses.h>
>> #else
>>-#include <curses.h>
>>+#include <ncurses/curses.h>
>> #endif
>>
>>
>
>Tego typu rzeczy można zastąpić przez przekazania
>"-I/usr/include/ncurses" do CFLAGS.
>
>
>>@@ -38,7 +38,7 @@
>> #include <termio.h>
>> #endif
>>
>>-#include <term.h>
>>+#include <ncurses/term.h>
>> #include <signal.h>
>> #include <dirent.h>
>> #include <wctype.h>
>>--- fish-1.6/proc.c.orig 2005-04-10 11:45:18.444941288 +0200
>>+++ fish-1.6/proc.c 2005-04-10 11:45:42.793239784 +0200
>>@@ -27,16 +27,16 @@
>> #include <sys/time.h>
>>
>> #if HAVE_NCURSES_H
>>-#include <ncurses.h>
>>+#include <ncurseees/ncurses.h>
>>
>>
>
>a tu dla odmiany literówka.
>
>
>
Dzięki za wskazówki
teraz powinno być lepiej :D
a co do literek to u mnie są normalnie.
-------------- next part --------------
# $Revision: 1.30 $, $Date: 2004/12/16 13:01:38 $
Summary: fish - A friendly interactive shell
Summary(pl): fish - przyjazna interaktywna powłoka
Name: fish
Version: 1.6
Release: 1
License: GPL
Group: Applications/Shells
Source0: http://roo.no-ip.org/fish/files/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: ab1b3603bdeaf4a758194d6236eb8da2
Patch0: %{name}-Makefile.patch
Patch1: %{name}-configure.patch
URL: http://roo.no-ip.org/fish/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: doxygen
BuildRequires: ncurses-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
fish is a shell geared towards interactive use. It's features are
focused on user friendlieness and discoverability. The language syntax
is simple but incompatible with other shell languages.
%description -l pl
fish jest powłoką nastawioną na interaktywne używanie. Jego cechą jest
przyjazne nastawienie dla użytkownika. Składnia języka jest prosta ale
nie jest zgodna z innymi językami powłoki.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
CFLAGS="-I /usr/include/ncurses"
%configure
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc INSTALL README
%doc %{_docdir}/%{name}/*
%attr(755,root,root) %{_bindir}/*
%{_mandir}/man1/*.1*
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log: fish.spec,v $
-------------- next part --------------
--- fish-1.6/Makefile.in.orig 2005-04-10 17:34:23.610792088 +0200
+++ fish-1.6/Makefile.in 2005-04-10 18:27:54.849609584 +0200
@@ -187,25 +187,25 @@
echo "}" >>$@
#man -- doc_src/builtin_doc/man/man1/`basename $@ .c`.1 | cat -s | ./gen_hdr2 >>$@
install: all
- $(INSTALL) -m 755 -o 0 -g 0 -d $(DESTDIR)/usr/local/bin/
+ $(INSTALL) -m 755 -d $(DESTDIR)/usr/bin/
for i in fish tokenize set_color xsel-0.9.6/xsel mimedb; do\
- $(INSTALL) -m 755 -o 0 -g 0 $$i $(DESTDIR)/usr/local/bin; \
+ $(INSTALL) -m 755 $$i $(DESTDIR)/usr/bin; \
done;
- $(INSTALL) -m 755 -o 0 -g 0 -d $(DESTDIR)/etc/fish.d
- $(INSTALL) -o 0 -g 0 -m 644 init/fish $(DESTDIR)/etc
- $(INSTALL) -o 0 -g 0 -m 644 init/fish_alias.fish $(DESTDIR)/etc/fish.d/;
- $(INSTALL) -o 0 -g 0 -m 644 init/fish_complete.fish $(DESTDIR)/etc/fish.d/;
- $(INSTALL) -o 0 -g 0 -m 644 init/fish_inputrc $(DESTDIR)/etc/fish_inputrc;
- $(INSTALL) -o 0 -g 0 -m 755 -d $(DESTDIR)/usr/share/doc/fish
+ $(INSTALL) -m 755 -d $(DESTDIR)/etc/fish.d
+ $(INSTALL) -m 644 init/fish $(DESTDIR)/etc
+ $(INSTALL) -m 644 init/fish_alias.fish $(DESTDIR)/etc/fish.d/;
+ $(INSTALL) -m 644 init/fish_complete.fish $(DESTDIR)/etc/fish.d/;
+ $(INSTALL) -m 644 init/fish_inputrc $(DESTDIR)/etc/fish_inputrc;
+ $(INSTALL) -m 755 -d $(DESTDIR)/usr/share/doc/fish
for i in user_doc/html/*; do \
- $(INSTALL) -m 644 -o 0 -g 0 $$i $(DESTDIR)/usr/share/doc/fish/; \
+ $(INSTALL) -m 644 $$i $(DESTDIR)/usr/share/doc/fish/; \
done
- $(INSTALL) -o 0 -g 0 -m 755 -d $(DESTDIR)/usr/local/man/man1
+ $(INSTALL) -m 755 -d $(DESTDIR)/usr/share/man/man1
for i in doc_src/fish.1 xsel-0.9.6/xsel.1x doc_src/builtin_doc/man/man1/mimedb.1 doc_src/builtin_doc/man/man1/set_color.1 doc_src/builtin_doc/man/man1/tokenize.1; do \
- $(INSTALL) -m 644 -o 0 -g 0 $$i $(DESTDIR)/usr/local/man/man1/; \
+ $(INSTALL) -m 644 $$i $(DESTDIR)/usr/share/man/man1/; \
done;
echo If you want to use fish as the default shell, remember to first
- echo add the line \'/usr/local/bin/fish\' to the file \'/etc/shells\'.
+ echo add the line \'/usr/bin/fish\' to the file \'/etc/shells\'.
#Local install
linstall: all
@@ -226,7 +226,7 @@
echo add the line \'$(HOME)/bin/fish\' to the file \'/etc/shells\'.
uninstall:
- rm -f $(DESTDIR)/usr/local/bin/fish $(DESTDIR)/usr/local/bin/tokenize $(DESTDIR)/usr/local/bin/set_color $(DESTDIR)/usr/local/bin/xsel $(DESTDIR)/usr/local/bin/mimedb
+ rm -f $(DESTDIR)/usr/bin/fish $(DESTDIR)/usr/local/bin/tokenize $(DESTDIR)/usr/local/bin/set_color $(DESTDIR)/usr/local/bin/xsel $(DESTDIR)/usr/local/bin/mimedb
rm -f $(DESTDIR)/etc/fish
rm -f $(DESTDIR)/etc/fish_inputrc
rm -f $(DESTDIR)/etc/fish.d/fish_alias $(DESTDIR)/etc/fish.d/fish_complete;
-------------- next part --------------
--- fish-1.6/configure.orig 2005-04-10 18:33:23.793602496 +0200
+++ fish-1.6/configure 2005-04-10 18:48:43.513783776 +0200
@@ -253,7 +253,7 @@
#
# Initializations.
#
-ac_default_prefix=/usr/local
+ac_default_prefix=/usr
ac_config_libobj_dir=.
cross_compiling=no
subdirs=
More information about the pld-devel-pl
mailing list