updates.

diff --git a/CHANGES b/CHANGES
index cda017613d576ae3a0b67d91caac67e70adeaa00..454abdf23f346916595710649924ed67907507db 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Wed May 30 18:46:34 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
+
+       * Added silc-toolkit.spec.in RPM spec file.
+
 Mon May 28 23:21:39 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed nickname formatting crash when updating existing

diff --git a/Makefile.ad b/Makefile.ad
index 8ba32eff7a25b0785d28307c2fe9309eaae26bce..e7dacff6ace2a8de2956e5997ad740dd20415011 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -37,6 +37,7 @@ SUBDIRS =             \
 EXTRA_DIST =           \
        silcdefs.h.in   \
 #ifdef SILC_DIST_TOOLKIT
+       silc-toolkit.spec \
        symbian         \
 #endif SILC_DIST_TOOLKIT
 #ifdef SILC_DIST_CLIENT

diff --git a/silc-toolkit.spec.in b/silc-toolkit.spec.in
index f2a1ca5b4ce493806e165882d22992bbaee7f2c6..f819953bc02082dfb3149470d40bd7df806453f6 100644 (file)
--- a/silc-toolkit.spec.in
+++ b/silc-toolkit.spec.in
@@ -47,27 +47,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 +66,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 +78,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