Merge commit 'origin/silc.1.1.branch'

[silc.git] / silc-toolkit.spec.in

diff --git a/silc-toolkit.spec.in b/silc-toolkit.spec.in
index f2a1ca5b4ce493806e165882d22992bbaee7f2c6..ea620ba88ca591efd56cef6a895c82f8c2b52b45 100644 (file)
--- a/silc-toolkit.spec.in
+++ b/silc-toolkit.spec.in
@@ -1,13 +1,13 @@
 Summary: SILC Toolkit
 Name: silc-toolkit
 Version: SILC_VERSION
-Release: 0.fc6
+Release: SILC_RELEASE
 License: GPL/BSD dual licensed
 Group: System Environment/Libraries
 URL: http://silcnet.org/
 Source0: silc-toolkit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: libtool pkgconfig
+BuildRequires: pkgconfig
 Obsoletes: libsilc
 Obsoletes: libsilc-devel
 Obsoletes: libsilc-doc
@@ -19,7 +19,8 @@ Epoch: 0
 %description
 SILC Toolkit providing SILC Protocol Core Library, SILC Client Library,
 runtime library and many other libraries.  SILC Toolkit enables SILC
-application development.
+application development.  SILC (Secure Internet Live Conferencing) is a
+secure conferencing protocol.
 
 %package devel
 Group: Development/Libraries
@@ -38,7 +39,7 @@ Toolkit enables SILC application development.
 %configure --libdir=%{_libdir} \
            --includedir=%{_includedir}/silc \
            --with-simdir=%{_libdir}/silc/modules \
-           --with-docdir=%{_docdir}/%{name}-%{version}
+           --docdir=%{_docdir}/%{name}-%{version}
 make -j4
 
 %install
@@ -47,27 +48,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/lib*
 chmod 0755 ${RPM_BUILD_ROOT}%{_libdir}/silc/modules/*.so
 
-# Move toolkit reference manual to root
-mv doc/toolkit toolkit
-
-# Remove files we don't want in the packages
-rm -rf \
-$RPM_BUILD_ROOT%{_sysconfdir}/silcalgs.conf \
-$RPM_BUILD_ROOT%{_sysconfdir}/silcd.conf \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/INSTALL \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.MACOSX \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.WIN32 \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.PLUGIN \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.SYMBIAN \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/TODO \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/example_silc.conf \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/example_silcd.conf \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples/ \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/CHANGES \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/tutorial \
-$RPM_BUILD_ROOT%{_mandir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,8 +67,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(0644, root, root, 0755)
-%doc CHANGES COPYING GPL BSD
-%doc --parents toolkit
+%doc CHANGES COPYING GPL BSD doc/toolkit
 %{_libdir}/libsilc.so
 %{_libdir}/libsilc.*a
 %{_libdir}/libsilcclient.so
@@ -100,7 +79,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed May 30 2007 Pekka Riikonen <priikone@silcnet.org>
-- Rewrote .spec for SILC Toolkit 1.1
+- Rewrote .spec for SILC Toolkit 1.1.  Obsoletes libsilc.  Renamed to
+  silc-toolkit.
 
 * Tue Sep 1 2004 Toni Willberg <toniw@iki.fi>
 - 0.9.12-0.fdr.6 - Had to remove smp_mflags because build fails with them