Changeset 1988

Show
Ignore:
Timestamp:
12/13/07 13:18:07 (7 months ago)
Author:
augur
Message:

Made multiple changes for Fedora folks. Still need to run rpmlint on it and see what else needs changed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • swish-e/branches/2.6/rpm/swish-e.spec.in

    r1982 r1988  
    11%define name    @PACKAGE@ 
    22%define version @VERSION@ 
    3 %define release 4 
     3%define release 5 
    44 
    55# SWISH::API definitions 
    66%define filelist %{_tmppath}/%{name}-%{version}/%{name}-%{version}-filelist 
    77%define NVR %{name}-%{version}-%{release} 
    8 %define maketest 0 
    98 
    109Summary:        SWISH-E - Simple Web Indexing System for Humans - Enhanced 
    …… 
    1211Version:        %{version} 
    1312Release:        %{release} 
    14 License:        GPL 
    15 Group:          Networking/Other 
     13License:        GNU General Public License v2.0 or later, with linking exception 
     14Group:          Applications/Internet 
    1615Source:         http://swish-e.org/Download/%{name}-%{version}.tar.gz 
    1716URL:            http://swish-e.org/ 
    1817BuildRoot:      %{_tmppath}/%name-root 
    19 Packager:       David L Norris <dave@webaugur.com> 
    20 Icon:           swish-e.xpm 
    21 Vendor:         SWISH-E Team <http://swish-e.org/> 
    2218Provides:       %{name} 
    2319Obsoletes:      %{name}-doc 
    24 Obsoletes:     swish 
     20Obsoletes:      swish 
    2521Requires:       libxml2, pcre, zlib 
    26 Prefix:         /usr 
     22BuildRequires:  libxml2-devel, pcre-devel, zlib-devel, perl(ExtUtils::MakeMaker) 
    2723 
    2824%description 
    …… 
    4036%package        perl 
    4137Summary:        SWISH-E - PERL Scripts and Modules 
    42 Group:          Networking/Other 
     38Group:          Applications/Internet 
    4339Provides:       %{name}-perl 
    4440Requires:       %{name} = %{version} 
    …… 
    5147%package        perl-api 
    5248summary:        SWISH::API - Perl interface to the Swish-e C Library 
    53 License:        Artistic 
    54 Group:          Applications/CPAN 
     49License:        Perl License 
     50Group:          Development/Libraries 
    5551Provides:       %{name}-perl-api 
    5652Provides:       perl-SWISH-API = 0.01 
    …… 
    6662%package        devel 
    6763Summary:        SWISH-E - Static libraries and header files. 
    68 Group:          Networking/Other 
     64Group:          Development/Libraries 
    6965Obsoletes:      swish-devel 
    7066Provides:       %{name}-devel 
    …… 
    9490%{__make} PREFIX=%{buildroot}%{_prefix} LIB='%{_libdir}' LIBS='-L%{_libdir} -L%{buildroot}/src/.libs -lswish-e -lz' 'LDFLAGS=-L%{_libdir} -L%{_builddir}/%{name}-%{version}/src/.libs' 'CCFLAGS=-I%{_builddir}/%{name}-%{version}/src' 'LDDLFLAGS=-shared -L%{_builddir}/%{name}-%{version}/src/.libs/ -lswish-e' 
    9591 
    96 %if %maketest 
    97 %{__make} test 
    98 %endif 
    9992popd 
    10093 
    …… 
    108101 
    109102[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress 
    110  
    111 # SuSE Linux 
    112 if [ -e /etc/SuSE-release -o -e /etc/UnitedLinux-release ] 
    113 then 
    114     %{__mkdir_p} %{buildroot}/var/adm/perl-modules 
    115     %{__cat} `find %{buildroot} -name "perllocal.pod"`  \ 
    116         | %{__sed} -e s+%{buildroot}++g                 \ 
    117         > %{buildroot}/var/adm/perl-modules/%{name} 
    118 fi 
    119103 
    120104# remove special files 
    …… 
    197181 
    198182%changelog 
     183* Thu Dec 13 2007 David L Norris <dave@webaugur.com> 2.5.6 
     184- Lots of changes to make Fedora happy. 
     185- Remove SUSE specific stuff. 
     186- Change SWISH::API License to same as perl. 
     187- Changed main license to match http://fedoraproject.org/wiki/Licensing 
    199188* Fri Apr 08 2005 Bernhard Weisshuhn <bkw@weisshuhn.de> 2.4.3-5 
    200189- Differentiate between libdir and libexecdir (for x86_64)