SPECS (AC-branch): alpine.spec - merged 1.10 from HEAD

blues blues at pld-linux.org
Wed Mar 26 21:18:52 CET 2008 

Author: blues                        Date: Wed Mar 26 20:18:52 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 1.10 from HEAD

---- Files affected:
SPECS:
   alpine.spec (1.28.2.15 -> 1.28.2.16) 

---- Diffs:

================================================================
Index: SPECS/alpine.spec
diff -u SPECS/alpine.spec:1.28.2.15 SPECS/alpine.spec:1.28.2.16
--- SPECS/alpine.spec:1.28.2.15	Wed Feb  6 10:19:37 2008
+++ SPECS/alpine.spec	Wed Mar 26 21:18:47 2008
@@ -3,34 +3,32 @@
 # - backport man-pages from pine.spec
 # - separate package with tcl web-frontend
 # - fix as-needed
+%define		ver		1.10
+%define		patchlevel	7
 Summary:	University of Washington Alpine mail user agent
 Summary(pl.UTF-8):	Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie
 Name:		alpine
-%define		ver		1.00
-%define		patchlevel	12
 Version:	%{ver}.%{patchlevel}
 Release:	1
 Epoch:		1
-License:	Apache License 2.0
+License:	Apache v2.0
 Group:		Applications/Mail
 # Main site:
 #Source0:	ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.gz
 # Source with applied patches from http://staff.washington.edu/chappa/alpine/
 Source0:	http://staff.washington.edu/chappa/alpine/patches/alpine-%{ver}/%{name}-%{ver}_%{patchlevel}.tar.gz
-# Source0-md5:	eccde18b953df022d5e073b7de6b9c1a
+# Source0-md5:	718427a037b63b482a60c763f517d2aa
 Source1:	pico.desktop
 Source2:	%{name}.desktop
 Source3:	%{name}.png
 Patch0:		%{name}-index_display.patch
 Patch1:		%{name}-doc.patch
 Patch2:		%{name}-filter.patch
-Patch3:		%{name}-quote.patch
-Patch4:		%{name}-fhs.patch
-Patch5:		%{name}-segfix.patch
-Patch6:		%{name}-libc-client.patch
-Patch7:		%{name}-ssl.patch
-Patch8:		%{name}-no_1777_warning.patch
-Patch9:		%{name}-home_etc.patch
+Patch3:		%{name}-fhs.patch
+Patch4:		%{name}-libc-client.patch
+Patch5:		%{name}-ssl.patch
+Patch6:		%{name}-no_1777_warning.patch
+Patch7:		%{name}-home_etc.patch
 URL:		http://www.washington.edu/alpine/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -41,12 +39,12 @@
 BuildRequires:	pam-devel
 # Only for web-frontend:
 #BuildRequires:	tcl-devel
+Provides:	pine = 5.10
 Obsoletes:	pine
-Provides:	pine = 5.00
 Suggests:	aspell
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		alpineconfdir	/etc/%{name}
+%define		alpineconfdir	%{_sysconfdir}/%{name}
 %define		filterout_ld	-Wl,--as-needed
 
 %description
@@ -74,7 +72,7 @@
 Summary(pl.UTF-8):	Prosty edytor tekstowy w stylu alpine
 Summary(pt_BR.UTF-8):	Editor de textos para terminal simples e fácil de usar
 Group:		Applications/Editors
-Provides:	pico = 5.00
+Provides:	pico = 5.10
 
 %description -n pico
 Pico is a simple, display-oriented text editor based on the Alpine
@@ -98,7 +96,7 @@
 Summary(pl.UTF-8):	Prosta przeglądarka plików w stylu composera alpine
 Summary(pt_BR.UTF-8):	Navegador de sistemas de arquivos no estilo do compositor do Alpine
 Group:		Applications/Shells
-Provides:	pilot = 5.00
+Provides:	pilot = 5.10
 
 %description -n pilot
 Pilot is a simple, display-oriented file system browser based on the
@@ -107,7 +105,7 @@
 
 %description -n pilot -l pl.UTF-8
 Pilot jest prostą, zorientowaną na wyświetlanie przeglądarką plików w
-stylu composera pine. Podobnie jak w alpine polecenia sa wyświetlane
+stylu composera pine. Podobnie jak w alpine polecenia są wyświetlane
 na dole ekranu oraz jest dostępna pomoc kontekstowa.
 
 %description -n pilot -l pt_BR.UTF-8
@@ -125,8 +123,6 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 rm -f libtool missing
@@ -140,8 +136,8 @@
 	--without-tcl \
 	--with-smtp-msa=%{_libdir}/sendmail \
 	--with-simple-spellcheck=aspell \
-	--with-system-pinerc=%{alpineconfdir}/%{name}.conf \
-	--with-system-fixed-pinerc=%{alpineconfdir}/%{name}.conf.fixed \
+	--with-system-pinerc=%{_sysconfdir}/%{name}/%{name}.conf \
+	--with-system-fixed-pinerc=%{_sysconfdir}/%{name}/%{name}.conf.fixed \
 	--with-ldap-dir=%{_prefix} \
 	--with-system-mail-directory=/var/mail \
 	--with-c-client-target=slx \
@@ -154,7 +150,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{alpineconfdir},%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -165,24 +161,24 @@
 
 ln -s alpine $RPM_BUILD_ROOT%{_bindir}/pine
 
-$RPM_BUILD_ROOT%{_bindir}/alpine -conf > $RPM_BUILD_ROOT%{alpineconfdir}/alpine.conf
-cat <<EOF > $RPM_BUILD_ROOT%{alpineconfdir}/alpine.conf.fixed
+$RPM_BUILD_ROOT%{_bindir}/alpine -conf > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf
+cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf.fixed
 #
 # Alpine system-wide enforced configuration file - customize as needed
 #
 # This file holds the system-wide enforced values for alpine configuration
 # settings. Any values set in it will override values set in the
-# system-wide default configuration file (%{alpineconfdir}/alpine.conf) and
+# system-wide default configuration file (%{_sysconfdir}/%{name}/alpine.conf) and
 # the user's own configuration file (~/.pinerc).
 # For more information on the format of this file, read the
-# comments at the top of %{alpineconfdir}/alpine.conf
+# comments at the top of %{_sysconfdir}/%{name}/alpine.conf
 
 EOF
 
 %post
-if [ -f "%{alpineconfdir}/alpine.conf" -a -f "%{alpineconfdir}/alpine.conf.rpmnew" ]; then
-	mv %{alpineconfdir}/alpine.conf %{alpineconfdir}/alpine.conf.backup
-	alpine -P %{alpineconfdir}/alpine.conf.backup -conf > /etc/alpine/alpine.conf || exit 0
+if [ -f "%{_sysconfdir}/%{name}/alpine.conf" -a -f "%{_sysconfdir}/%{name}/alpine.conf.rpmnew" ]; then
+	cp -f %{_sysconfdir}/%{name}/alpine.conf{,.backup}
+	alpine -P %{_sysconfdir}/%{name}/alpine.conf.backup -conf > %{_sysconfdir}/%{name}/alpine.conf || exit 0
 fi
 
 %clean
@@ -191,9 +187,9 @@
 %files
 %defattr(644,root,root,755)
 %doc README doc/tech-notes.txt
-%dir %{alpineconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{alpineconfdir}/alpine.conf
-%config(noreplace) %verify(not md5 mtime size) %{alpineconfdir}/alpine.conf.fixed
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/alpine.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/alpine.conf.fixed
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/pine
 %attr(755,root,root) %{_bindir}/rpload
@@ -221,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28.2.16  2008-03-26 20:18:47  blues
+- merged 1.10 from HEAD
+
 Revision 1.28.2.15  2008-02-06 09:19:37  blues
 - patchlevel 12 from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/alpine.spec?r1=1.28.2.15&r2=1.28.2.16&f=u

More information about the pld-cvs-commit mailing list