Author: glen Date: Wed Feb 20 15:34:00 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- HEAD merge:
- aah... move dovecot-config instead of symlinking
- updated init script (force-reload=reload, added running check to reload, added try-restart)
- -devel no longer requires daemon
- use --enable-header-install to install headers
- install libs to dirs separate from plugins tree (%{_libdir}/dovecot-devel)
---- Files affected:
SPECS:
dovecot.spec (1.77 -> 1.77.2.1)
---- Diffs:
================================================================
Index: SPECS/dovecot.spec
diff -u SPECS/dovecot.spec:1.77 SPECS/dovecot.spec:1.77.2.1
--- SPECS/dovecot.spec:1.77 Wed Jan 2 22:49:56 2008
+++ SPECS/dovecot.spec Wed Feb 20 16:33:55 2008
@@ -11,8 +11,8 @@
Summary(pl.UTF-8): Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
Name: dovecot
Version: 1.0.10
-Release: 1
-License: LGPL v2.1 and MIT
+Release: 3
+License: MIT (libraries), LGPL v2.1 (the rest)
Group: Networking/Daemons
Source0: http://dovecot.org/releases/1.0/%{name}-%{version}.tar.gz
# Source0-md5: c050fa2a7dae8984d432595e3e8183e1
@@ -112,17 +112,20 @@
plików może być problematyczna
%package devel
-Summary: Libraries and headers for Dovecot
+Summary: Development package for dovecot plugins
+Summary(pl.UTF-8): Pakiet programistyczny do tworzenia wtyczek dla dovecota
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+# doesn't require base
%description devel
-This package contains development files for linking against %{name}.
+Development package for dovecot plugins.
+
+%description devel -l pl.UTF-8
+Pakiet programistyczny do tworzenia wtyczek dla dovecota.
%prep
%setup -q
%patch0 -p1
-#%patch1 -p1
%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' dovecot-example.conf
@@ -134,7 +137,9 @@
%{__autoheader}
%{__automake}
%configure \
+ --disable-static \
%{?debug:--enable-debug} \
+ --enable-header-install \
%{?with_ldap:--with-ldap} \
%{?with_mysql:--with-mysql} \
%{?with_pgsql:--with-pgsql} \
@@ -165,21 +170,16 @@
touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
-# devel
-for folder in deliver imap lib lib-imap lib-mail lib-storage; do
- install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder
- install -p -m644 src/$folder/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder/
-done
-
-for folder in lib lib-imap lib-mail lib-storage; do
- install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/$folder
- install -p -m644 src/$folder/*.a $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/$folder/
-done
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins{,/imap}/*.la
-for f in dovecot-config config.h stamp.h; do
- install -p -m644 $f $RPM_BUILD_ROOT%{_includedir}/%{name}
+# devel
+for dir in lib lib-imap lib-mail lib-storage; do
+ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/src/$dir
+ install -p -m644 src/$dir/*.a $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/src/$dir
done
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dovecot-config $RPM_BUILD_ROOT%{_libdir}/%{name}-devel
+rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}/wiki
%clean
rm -rf $RPM_BUILD_ROOT
@@ -222,8 +222,7 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
%attr(754,root,root) /etc/rc.d/init.d/%{name}
-#Files :P
-%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply
%attr(755,root,root) %{_libdir}/%{name}/deliver
%attr(755,root,root) %{_libdir}/%{name}/dict
@@ -237,7 +236,7 @@
%attr(755,root,root) %{_libdir}/%{name}/pop3-login
%attr(755,root,root) %{_libdir}/%{name}/rawlog
%attr(755,root,root) %{_libdir}/%{name}/ssl-build-param
-%dir %{_libdir}/%{name}/plugins/
+%dir %{_libdir}/%{name}/plugins
%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
%dir %{_libdir}/%{name}/plugins/imap
%attr(755,root,root)%{_libdir}/%{name}/plugins/imap/*.so
@@ -251,27 +250,23 @@
%files devel
%defattr(644,root,root,755)
-%{_libdir}/%{name}/plugins/*.a
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.la
-%{_libdir}/%{name}/plugins/imap/*.a
-%attr(755,root,root) %{_libdir}/%{name}/plugins/imap/*.la
-%dir %{_libdir}/%{name}/plugins/lib
-%{_libdir}/%{name}/plugins/lib/*.a
-%dir %{_libdir}/%{name}/plugins/lib-imap
-%{_libdir}/%{name}/plugins/lib-imap/*.a
-%dir %{_libdir}/%{name}/plugins/lib-mail
-%{_libdir}/%{name}/plugins/lib-mail/*.a
-%dir %{_libdir}/%{name}/plugins/lib-storage
-%{_libdir}/%{name}/plugins/lib-storage/*.a
+%{_libdir}/%{name}-devel
%{_includedir}/%{name}
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.77.2.1 2008-02-20 15:33:55 glen
+- HEAD merge:
+ - aah... move dovecot-config instead of symlinking
+ - updated init script (force-reload=reload, added running check to reload, added try-restart)
+ - -devel no longer requires daemon
+ - use --enable-header-install to install headers
+ - install libs to dirs separate from plugins tree (%{_libdir}/dovecot-devel)
+
Revision 1.77 2008-01-02 21:49:56 arekm
- up to 1.0.10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dovecot.spec?r1=1.77&r2=1.77.2.1&f=u