rpms/sylpheed/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sylpheed.spec, 1.1, 1.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20400/devel

Modified Files:
	.cvsignore sources sylpheed.spec 
Log Message:
auto-import sylpheed-1.0.3-1 on branch devel from sylpheed-1.0.3-1.src.rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 23:46:11 -0000	1.2
+++ .cvsignore	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1 @@
-sylpheed-1.0.0.tar.bz2
+sylpheed-1.0.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 23:46:11 -0000	1.2
+++ sources	4 Mar 2005 23:51:10 -0000	1.3
@@ -1 +1 @@
-864c4fc581a5ab1c7af5e06153c76769  sylpheed-1.0.0.tar.bz2
+9e2733a0ea903c3fb29f537b67a6f15a  sylpheed-1.0.3.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sylpheed.spec	4 Mar 2005 23:46:11 -0000	1.1
+++ sylpheed.spec	4 Mar 2005 23:51:10 -0000	1.2
@@ -1,20 +1,26 @@
+# should be vendor 'fedora', but that would break upgrades for
+# people who have linked the desktop icon
+%define desktopvendor redhat
+
+Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.0.0
+Version: 1.0.3
 Release: 1
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 BuildPreReq: openssl-devel pkgconfig gtk+-devel gdk-pixbuf-devel desktop-file-utils
-%{?_with_gpgme:BuildRequires: gpgme-devel}
-Source: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
+%{!?_without_gpgme:BuildRequires: gpgme-devel >= 1.0.0}
+%{!?_without_compface:BuildRequires: compface-devel}
+BuildRequires: autoconf gettext
+Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Source1: sylpheed.1
 
-Patch: %{name}-0.8.9-ck.patch
+Patch0: %{name}-0.8.9-ck.patch
 Patch1: %{name}-0.8.9-ssl.patch
 Patch2: sylpheed-default-browser.patch
 
-Summary: A GTK+ based, lightweight, and fast email client.
 %description
 This program is an X based fast email client which has features
 like:
@@ -32,26 +38,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch -p1 -b .ck
+%patch0 -p1 -b .ck
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 
 %build
 autoconf
-%configure --enable-ssl %{?_with_gpgme:--enable-gpgme}
-make
+%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
+	%{?_without_compface:--disable-compface}
+make %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 install -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
-desktop-file-install --vendor redhat --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+desktop-file-install --vendor %{desktopvendor} \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
 	--add-category Application \
 	--add-category Network \
 	--add-category X-Red-Hat-Extra \
+	--add-category X-Fedora-Extra \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -59,7 +68,7 @@
 %find_lang %{name}
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
@@ -71,6 +80,11 @@
 %{_mandir}/man1
 
 %changelog
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-1
+- Update to 1.0.3.
+- Enable support for GPGME 1.0 and compface.
+- Apply common spec cleanup.
+
 * Wed Jan  5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
 - New upstream release.