rpms/kannel/devel kannel.spec,1.13,1.14

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/kannel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1488

Modified Files:
	kannel.spec 
Log Message:
Update License field and minor spec file cleanups.



Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kannel.spec	16 Oct 2006 14:38:52 -0000	1.13
+++ kannel.spec	6 Aug 2007 12:09:56 -0000	1.14
@@ -1,8 +1,8 @@
 Summary: WAP and SMS gateway
 Name: kannel
 Version: 1.4.1
-Release: 2%{?dist}
-License: Kannel
+Release: 4
+License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
 Source0: http://www.kannel.org/download/%{version}/gateway-%{version}.tar.bz2
@@ -10,14 +10,9 @@
 Source2: kannel.init
 Source3: kannel.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex
+BuildRequires: bison, byacc, flex, ghostscript
 BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
-# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 6
 BuildRequires: sqlite-devel
-%else
-BuildRequires: sqlite2-devel
-%endif
 %{?_with_mysql:Buildrequires: mysql-devel}
 %{?_with_pgsql:Buildrequires: postgresql-devel}
 # For the docs...
@@ -36,7 +31,7 @@
 %package devel
 Summary: Development files for the kannel WAP and SMS gateway
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -51,7 +46,7 @@
 
 
 %prep
-%setup -n gateway-%{version}
+%setup -q -n gateway-%{version}
 
 
 %build
@@ -59,11 +54,7 @@
     --enable-pcre \
     --enable-docs \
     --enable-start-stop-daemon \
-%if %{!?fedora:6}%{?fedora} >= 6
     --with-sqlite3 \
-%else
-    --with-sqlite \
-%endif
     %{?_with_mysql} \
     %{?_with_pgsql}
 # Remove %{?_smp_mflags} since the docs fail to build with it
@@ -72,7 +63,7 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 # Install fakesmsc and fakewap, useful for monitoring
 %{__install} -m 0755 test/{fakesmsc,fakewap} %{buildroot}%{_bindir}/
 # Logrotate entry
@@ -86,6 +77,8 @@
 # Rename start-stop-daemon to start-stop-kannel
 %{__mv} %{buildroot}%{_sbindir}/start-stop-daemon \
         %{buildroot}%{_sbindir}/start-stop-kannel
+# Remove executable bit from man pages (as of 1.4.1)
+%{__chmod} -x %{buildroot}%{_mandir}/man?/*
 
 
 %clean
@@ -114,25 +107,41 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
-%attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
+%attr(0640,kannel,kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
-%config %{_sysconfdir}/rc.d/init.d/kannel
-%{_bindir}/*
+%{_sysconfdir}/rc.d/init.d/kannel
+%{_bindir}/fakesmsc
+%{_bindir}/fakewap
+%{_bindir}/mtbatch
+%{_bindir}/seewbmp
+%{_bindir}/wmlsc
+%{_bindir}/wmlsdasm
 %{_sbindir}/*
 %{_mandir}/man?/*
-%attr(0750, kannel, kannel) %dir %{_var}/log/kannel/
+%attr(0750,kannel,kannel) %dir %{_var}/log/kannel/
 
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
+%{_bindir}/gw-config
 %{_includedir}/kannel/
 %dir %{_libdir}/kannel/
 %{_libdir}/kannel/*.a
 
 
 %changelog
+* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.4.1-4
+- Update License field.
+- Switch to using the DESTDIR install method.
+- No longer mark init script as config file.
+- Remove executable bit from man pages.
+- Move gw-config to devel sub-package.
+
+* Thu Dec 14 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-3
+- Add ghostscript build requirement, needed (at least on) RHEL4.
+
 * Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
 - Make sure we keep sqlite2 support for FC5 and below.