From 04c74816c31a280a3bedc57dfea71f8a51d040ae Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sat, 2 Jun 2007 18:20:05 +0000 Subject: [PATCH] Added silc-client.spec.in RPM spec file for SILC Client Fixed help default path. --- apps/irssi/Makefile.am | 3 +- apps/irssi/configure.ad | 6 +-- apps/irssi/configure.in | 1 - apps/irssi/irssi.spec.in | 73 ---------------------------------- apps/irssi/silc-client.spec.in | 58 +++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 79 deletions(-) delete mode 100644 apps/irssi/irssi.spec.in create mode 100644 apps/irssi/silc-client.spec.in diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am index c37c8190..18500f2f 100644 --- a/apps/irssi/Makefile.am +++ b/apps/irssi/Makefile.am @@ -35,8 +35,7 @@ EXTRA_DIST = \ curses.m4 \ README \ file2header.sh \ - irssi.spec \ - irssi.spec.in \ + silc-client.spec \ $(conffile) \ $(theme_DATA) \ irssi-config.in \ diff --git a/apps/irssi/configure.ad b/apps/irssi/configure.ad index a25473e7..94559d06 100644 --- a/apps/irssi/configure.ad +++ b/apps/irssi/configure.ad @@ -4,7 +4,7 @@ # # Author: Pekka Riikonen # -# Copyright (C) 2005 Pekka Riikonen +# Copyright (C) 2005 - 2007 Pekka Riikonen # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,9 +30,9 @@ IRSSI_SUBDIR=irssi # help directory # -HELPDIR="$silc_prefix/help" +HELPDIR="$datadir/silc/help" AC_ARG_WITH(helpdir, - [[ --with-helpdir=DIR directory for SILC Client help files [PREFIX/help]]], + [[ --with-helpdir=DIR directory for SILC Client help files [DATADIR/silc/help]]], [ case "$withval" in no|yes) diff --git a/apps/irssi/configure.in b/apps/irssi/configure.in index c1b1aaf5..922fab3d 100644 --- a/apps/irssi/configure.in +++ b/apps/irssi/configure.in @@ -878,7 +878,6 @@ docs/help/Makefile docs/help/in/Makefile irssi-version.h stamp.h -irssi.spec irssi-config) dnl ** for building from objdir diff --git a/apps/irssi/irssi.spec.in b/apps/irssi/irssi.spec.in deleted file mode 100644 index d902f786..00000000 --- a/apps/irssi/irssi.spec.in +++ /dev/null @@ -1,73 +0,0 @@ -# $Revision$, $Date$ -Name: irssi -Version: @VERSION@ -Release: 1 -Vendor: Timo Sirainen -Summary: Irssi is a IRC client -Copyright: GPL -Group: Applications/Communications -URL: http://irssi.org/ -Source0: http://irssi.org/irssi/files/%{name}-%{version}.tar.gz -BuildRequires: glib-devel -BuildRequires: ncurses-devel -BuildRoot: /tmp/%{name}-%{version}-root - -%define _sysconfdir /etc -%define configure { CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; ./configure %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} } - -%description -Irssi is a modular IRC client that currently has only text -mode user interface, but 80-90% of the code isn't text mode specific -so other UI could be created pretty easily. Also, Irssi isn't really -even IRC specific anymore, there's already a working SILC module -available. Support for other protocols like ICQ could be create some day -too. - -More information can be found at http://irssi.org/. - -%prep -%setup -q - -%build -export NOCONFIGURE=x -./autogen.sh -%configure \ - --with-imlib \ - --enable-ipv6 \ - --with-textui \ - --with-socks \ - --with-bot \ - --with-proxy \ - --with-perl=yes \ - --with-ncurses -make - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr install -mv $RPM_BUILD_ROOT/%{_datadir}/doc/irssi $RPM_BUILD_ROOT/%{_datadir}/doc/irssi-%version -strip $RPM_BUILD_ROOT/%{_bindir}/* -strip $RPM_BUILD_ROOT/%{_libdir}/irssi/modules/lib*.so* -rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/5.6.0/i386-linux/perllocal.pod - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr (644,root,root,755) -%doc %{_datadir}/doc/irssi-%version/ - -%attr(755,root,root) %{_bindir}/* - -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/irssi* - -%dir %{_libdir} -%attr(755,root,root) %{_libdir}/irssi -%attr(755,root,root) %{_libdir}/perl5 - -%dir %{_datadir}/irssi -%attr(755,root,root) %{_datadir}/irssi/* - -%changelog -* Fri Aug 17 2001 - Joose Vettenranta - Created new spec file from spec file founded in irssi-0.7.98.3 diff --git a/apps/irssi/silc-client.spec.in b/apps/irssi/silc-client.spec.in new file mode 100644 index 00000000..c4c1afd1 --- /dev/null +++ b/apps/irssi/silc-client.spec.in @@ -0,0 +1,58 @@ +Summary: SILC Client +Name: silc-client +Version: SILC_VERSION +Release: SILC_RELEASE +License: GPL +Group: Applications/Communications +URL: http://silcnet.org/ +Source0: silc-client-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: silc-toolkit-devel +Requires: silc-toolkit >= 1.1 + +%description +SILC (Secure Internet Live Conferencing) is a protocol which provides +secure conferencing services on the Internet over insecure channel. +SILC Client is used to connect to SILC server and SILC network. More +information at http://silcnet.org/. + +# Need this because the irssi's configure we run from silc-client +# configure somehow installs some of the files to location where I don't +# know how to reach them. +%define _unpackaged_files_terminate_build 0 + +%prep +%setup -q + +%build +%configure --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --bindir=%{_bindir} \ + --datadir=%{_datadir} \ + --with-perl-lib=%{_libdir}/silc/perl5 \ + --enable-ipv6 --with-socks --with-perl=yes +make -j4 + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/5.6.0/i386-linux/perllocal.pod +rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/silc-client + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr (-,root,root,-) +%{_bindir}/* +%{_libdir}/silc/perl5 +%{_sysconfdir}/silc.conf +%{_mandir}/man1/* +%{_datadir}/silc +%doc CHANGES COPYING CREDITS README README.PLUGIN TODO doc/FAQ +%doc apps/irssi/docs/*.txt apps/irssi/docs/*.html + +%changelog +* Sat Jun 2 2007 - Pekka Riikonen +- Initial version -- 2.24.0