From 04fef7bb33d42d2d928a6f1d0798e53f06d00f19 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 30 May 2007 15:47:36 +0000 Subject: [PATCH] updates. --- CHANGES | 4 ++++ Makefile.ad | 1 + silc-toolkit.spec.in | 27 +++------------------------ 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/CHANGES b/CHANGES index cda01761..454abdf2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +Wed May 30 18:46:34 EEST 2007 Pekka Riikonen + + * Added silc-toolkit.spec.in RPM spec file. + Mon May 28 23:21:39 EEST 2007 Pekka Riikonen * Fixed nickname formatting crash when updating existing diff --git a/Makefile.ad b/Makefile.ad index 8ba32eff..e7dacff6 100644 --- 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 f2a1ca5b..f819953b 100644 --- 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 -- 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 - 0.9.12-0.fdr.6 - Had to remove smp_mflags because build fails with them -- 2.24.0