rpms/swish-e/devel swish-e-2.4.2-httpd.conf, NONE, 1.1 swish-e-2.4.2-src_compress.c.patch, NONE, 1.1 swish-e-2.4.2-src_parser.c.patch, NONE, 1.1 swish-e-2.4.2.FC4.spec, NONE, 1.1 swish-e.xpm, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Byron Young (bkyoung)
fedora-extras-commits at redhat.com
Sun Sep 18 23:30:47 UTC 2005
Author: bkyoung
Update of /cvs/extras/rpms/swish-e/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31776/devel
Modified Files:
.cvsignore sources
Added Files:
swish-e-2.4.2-httpd.conf swish-e-2.4.2-src_compress.c.patch
swish-e-2.4.2-src_parser.c.patch swish-e-2.4.2.FC4.spec
swish-e.xpm
Log Message:
auto-import swish-e-2.4.2-2_FC4 on branch devel from swish-e-2.4.2-2_FC4.src.rpm
--- NEW FILE swish-e-2.4.2-httpd.conf ---
Alias /swish-e "/usr/share/doc/swish-e-2.4.2/html"
<Directory "/usr/share/doc/swish-e-2.4.2/html">
Options Indexes
AllowOverride None
Order allow,deny
Allow from all
</Directory>
swish-e-2.4.2-src_compress.c.patch:
--- NEW FILE swish-e-2.4.2-src_compress.c.patch ---
*** src/compress.c.orig 2005-04-26 19:24:25.000000000 -0700
--- src/compress.c 2005-04-26 19:32:05.000000000 -0700
***************
*** 689,695 ****
if(! saved_bytes) /* nothing to do */
return;
new_buf= (unsigned char *) emalloc(*buf_size + saved_bytes);
! zlib_status = uncompress(new_buf, &new_buf_size, *buf, (uLongf)buf_size );
if ( zlib_status != Z_OK )
{
// $$$ make sure this works ok if returning null $$$
--- 689,695 ----
if(! saved_bytes) /* nothing to do */
return;
new_buf= (unsigned char *) emalloc(*buf_size + saved_bytes);
! zlib_status = uncompress(new_buf, &new_buf_size, *buf, (uLongf) *buf_size );
if ( zlib_status != Z_OK )
{
// $$$ make sure this works ok if returning null $$$
swish-e-2.4.2-src_parser.c.patch:
--- NEW FILE swish-e-2.4.2-src_parser.c.patch ---
*** src/parser.c.orig 2005-09-14 10:34:21.000000000 -0700
--- src/parser.c 2005-09-14 11:13:40.000000000 -0700
***************
*** 870,876 ****
if ( used > 0 ) // tally up total bytes consumed
buf->cur += used;
! if ( ret == 0 ) // all done
return;
if ( ret == -2 ) // encoding failed
--- 870,876 ----
if ( used > 0 ) // tally up total bytes consumed
buf->cur += used;
! if ( ret >= 0 ) // all done
return;
if ( ret == -2 ) // encoding failed
--- NEW FILE swish-e-2.4.2.FC4.spec ---
%define name swish-e
%define version 2.4.2
%define release 2_FC4
%define httpd_conf_d_dir /etc/httpd/conf.d
# Conditionals
# --with debug: Replaces -O2 with -O0 in CFLAGS, AND builds debuginfo package.
# --without debug OR missing: Disables debuginfo package AND Removes -g.
%{!?_with_debug:%define debug_package %{nil}}
Summary: SWISH-E - Simple Web Indexing System for Humans - Enhanced
Name: %{name}
Version: %{version}
Release: %{release}
License: GPL
Group: Networking/Other
Source: http://swish-e.org/Download/%{name}-%{version}.tar.gz
Source1: %{name}-%{version}-httpd.conf
URL: http://swish-e.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Icon: swish-e.xpm
Provides: %{name}
Obsoletes: swish
Requires: libxml2 >= 2.6.19, pcre >= 5.0, zlib >= 1.2.2.2
BuildRequires: libxml2-devel >= 2.6.19, pcre-devel >= 5.0, zlib-devel >= 1.2.2.2
Prefix: /usr
Patch0: %{name}-%{version}-src_parser.c.patch
Patch1: %{name}-%{version}-src_compress.c.patch
BuildArch: i386 x86_64
%description
Swish-e is Simple Web Indexing System for Humans - Enhanced
Swish-e can quickly and easily index directories of files or remote
web sites and search the generated indexes.
Swish-e is extremely fast in both indexing and searching, highly
configurable, and can be seamlessly integrated with existing web sites
to maintain a consistent design. Swish-e can index web pages, but can
just as easily index text files, mailing list archives, or data stored
in a relational database.
%package perl
Summary: SWISH-E - PERL Scripts and Modules
Group: Networking/Other
Provides: %{name}-perl
Requires: %{name} = %{version}, perl >= 5.8.0
%description perl
PERL SWISH-E language bindings and scripts.
%package doc
Summary: doc
Group: Networking/Other
Provides: %{name}-doc
Requires: %{name} = %{version}
%description doc
SWISH-E documentation and examples
%package devel
Summary: SWISH-E - Static libraries and header files.
Group: Networking/Other
Obsoletes: swish-devel
Provides: %{name}-devel
Requires: %{name} = %{version}, libxml2-devel, pcre-devel, zlib-devel
%description devel
Libraries and header files required for compiling applications based on the SWISH-E API.
%prep
%setup -q
A=`find ./ -name "Makefile.in"`
for i in $A; do
%{__sed} -i 's/\$(datadir)\/doc\/swish-e/\/usr\/share\/doc/g' $i
done
%{__sed} -i 's/\$(datadir)\/doc\/\$(PACKAGE)/\/usr\/share\/doc/g' Makefile.in
%patch0
%patch1
%build
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
%{?_with_debug:CFLAGS="${CFLAGS//-O2/-O0}"}
%{!?_with_debug:CFLAGS="${CFLAGS//-g/}"}
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS
for i in $(find . -name config.guess -o -name config.sub) ; do
if [ -f /usr/lib/rpm/redhat/$(basename $i) ]; then
%{__rm} -f $i
%{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
fi
done
./configure \
--host=%{_host} \
--build=%{_build} \
--target=%{_target_platform} \
--with-pcre \
--with-libxml2 \
--with-zlib \
--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} \
make
%install
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT};
make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} sysconfdir=%{_sysconfdir} install
# If httpd is installed, this aliases the docs into webspace.
# if httpd is not installed, this just creates some directories.
%{__install} -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{httpd_conf_d_dir}/swish-e.conf
for i in $RPM_BUILD_ROOT%{_mandir}/man1/*.gz; do
%{__rm} -f $i
done
%{__install} -d -p -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e/* $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
rmdir $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/INSTALL $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/README $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%{__mv} $RPM_BUILD_ROOT%{_defaultdocdir}/README.cvs $RPM_BUILD_ROOT%{_defaultdocdir}/swish-e-%{version}
%clean
[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d ${RPM_BUILD_ROOT} ] && %{__rm} -rf ${RPM_BUILD_ROOT};
%files
%defattr(-, root, root)
%{_bindir}/swish-e
%{_libdir}/swish-e/swishspider
%{_libdir}/libswish-e.so.2.0.0
%{_libdir}/libswish-e.so.2
%{_mandir}/man1/swish-e.1.gz
%{_mandir}/man1/SWISH-CONFIG.1.gz
%{_mandir}/man1/SWISH-FAQ.1.gz
%{_mandir}/man1/SWISH-LIBRARY.1.gz
%{_mandir}/man1/SWISH-RUN.1.gz
%files perl
%defattr(-, root, root)
%{_libdir}/swish-e/perl/SWISH/Filters/Doc2txt.pm
%{_libdir}/swish-e/perl/SWISH/Filters/Pdf2HTML.pm
%{_libdir}/swish-e/perl/SWISH/Filters/ID3toHTML.pm
%{_libdir}/swish-e/perl/SWISH/Filters/XLtoHTML.pm
%{_libdir}/swish-e/perl/SWISH/Filter.pm
%{_libdir}/swish-e/perl/SWISH/DateRanges.pm
%{_libdir}/swish-e/perl/SWISH/DefaultHighlight.pm
%{_libdir}/swish-e/perl/SWISH/PhraseHighlight.pm
%{_libdir}/swish-e/perl/SWISH/SimpleHighlight.pm
%{_libdir}/swish-e/perl/SWISH/TemplateDefault.pm
%{_libdir}/swish-e/perl/SWISH/TemplateDumper.pm
%{_libdir}/swish-e/perl/SWISH/TemplateFrame.pm
%{_libdir}/swish-e/perl/SWISH/TemplateHTMLTemplate.pm
%{_libdir}/swish-e/perl/SWISH/TemplateToolkit.pm
%{_libdir}/swish-e/perl/SWISH/ParseQuery.pm
%{_libdir}/swish-e/perl/doc2txt.pm
%{_libdir}/swish-e/perl/pdf2html.pm
%{_libdir}/swish-e/perl/pdf2xml.pm
%{_libdir}/swish-e/spider.pl
%{_libdir}/swish-e/DirTree.pl
%{_libdir}/swish-e/search.cgi
%{_libdir}/swish-e/swish.cgi
%{_bindir}/swish-filter-test
%{_datadir}/swish-e/search.tt
%{_datadir}/swish-e/swish.tmpl
%files doc
%defattr(-, root, root)
%docdir %{_defaultdocdir}/swish-e-%{version}
%doc %{_defaultdocdir}/swish-e-%{version}
#%doc %{_defaultdocdir}/swish-e/examples
#%doc %{_defaultdocdir}/swish-e-%{version}/html
#%doc %{_defaultdocdir}/swish-e-%{version}/examples
#%doc %{_defaultdocdir}/swish-e-%{version}/INSTALL
#%doc %{_defaultdocdir}/swish-e-%{version}/README
#%doc %{_defaultdocdir}/swish-e-%{version}/README.cvs
%config %{httpd_conf_d_dir}/swish-e.conf
%files devel
%defattr(-, root, root)
%{_includedir}/swish-e.h
%{_libdir}/libswish-e.la
%{_libdir}/libswish-e.a
%{_libdir}/libswish-e.so
%changelog
* Wed Sep 14 2005 Byron Young <spamiccling at yahoo.com> 2.4.2
- Packaged for FC4
- Added --with debug conditional rpmbuild option.
- Fixed error on x86_64 systems.
- Fixed harmless UTF8 to latin1 error message.
* Fri Oct 24 2003 David L Norris <dave at webaugur.com> 2.4.0-pr4-0
- Added new files and moved extra documentation and examples to a separate package.
* Mon Jun 30 2003 David L Norris <dave at webaugur.com> 2.4.0-pr1-1cefha
- Modified spec file to minimize dependences on CEFHA.org server.
* Thu Jun 19 2003 David L Norris <dave at webaugur.com> 2.4.0-pr1
- Updated RPM spec to provide recently added files
* Sun Apr 20 2003 David L Norris <dave at webaugur.com> 2.3.5
- Updated RPM to provide the SWISH-E helper scripts.
* Fri Mar 28 2003 David L Norris <dave at webaugur.com> 2.3.5
- Updated RPM for the new libtool-based 2.3.5 build system.
* Wed Dec 04 2002 David L Norris <dave at webaugur.com> 2.3-dev04
- Created RPM spec file
--- NEW FILE swish-e.xpm ---
/* XPM */
static char *swish-e[] = {
/* columns rows colors chars-per-pixel */
"20 20 16 1",
" c #5a3025",
". c #743f33",
"X c #7c4d44",
"o c #855c50",
"O c #957065",
"+ c #997d70",
"@ c #a68c7f",
"# c #af9a8e",
"$ c #b0a396",
"% c #bbb0a6",
"& c #c5c1b8",
"* c #cecec1",
"= c #d7d7c8",
"- c #e2e2d5",
"; c #f0f0e5",
": c #fcfcf7",
/* pixels */
"::::;&&%&%&%&&&&&#%:",
":::&%%%%%%%%%%%%%X$;",
"::&&%;;;;;;;;;;;; #;",
":;%%:;;;;;;-;;;-- @-",
":%%=;-+XXX.... +=",
":%$;;# +@@@@@@@+++$&",
":%$;-Oo===****=**&&&",
":$$--$+@@@@@@@%*&&&&",
":$%&--#@@@@@+@@O&&&&",
":;@@*==**&&*&&@@O&**",
":;*+O%=********%X+==",
":;;&oXoO+OOO@%**#.*-",
":;;--#Oooooo.+&*&.#=",
":;;--======*$%@=* @-",
":&%$$##@@@@@+$%=* +=",
":%&$#@@@@@@@@@**@ &*",
":%%---**&&&*&***XX**",
":$$;-===*****=%X %*&",
":$+@#@@@@@@@@o %**&",
";O o+&&*&*"
};
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swish-e/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 18 Sep 2005 23:19:24 -0000 1.1
+++ .cvsignore 18 Sep 2005 23:30:45 -0000 1.2
@@ -0,0 +1 @@
+swish-e-2.4.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swish-e/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 18 Sep 2005 23:19:24 -0000 1.1
+++ sources 18 Sep 2005 23:30:45 -0000 1.2
@@ -0,0 +1 @@
+1606e2f55034540f88c1748eeaae5274 swish-e-2.4.2.tar.gz
More information about the fedora-extras-commits
mailing list