rpms/sylpheed-claws/FC-3 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 sylpheed-claws.spec, 1.4, 1.5

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14285

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- Version upgrade (security fixes)
- specfile cleanups
- remove aspell version check



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2005 12:41:13 -0000	1.3
+++ .cvsignore	14 Apr 2005 14:58:44 -0000	1.4
@@ -1 +1 @@
-sylpheed-claws-1.0.1.tar.bz2
+sylpheed-claws-1.0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Feb 2005 12:41:14 -0000	1.4
+++ sources	14 Apr 2005 14:58:44 -0000	1.5
@@ -1 +1 @@
-c297d397f99d97234df787dca61aa48e  sylpheed-claws-1.0.1.tar.bz2
+ac473de7189a4a9baecf16b72c34dff4  sylpheed-claws-1.0.4.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-3/sylpheed-claws.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sylpheed-claws.spec	13 Feb 2005 12:41:14 -0000	1.4
+++ sylpheed-claws.spec	14 Apr 2005 14:58:44 -0000	1.5
@@ -1,17 +1,14 @@
 %define         openssl_pc  %(if test -z `rpm -ql openssl-devel | grep pkgconfig` ; then echo 0; else echo 1; fi )
 
-#This is not the best way to do this but works here
-%define         aspellver     %(rpm -q --qf "%%{version}" aspell)
-
 Name:           sylpheed-claws
-Version:        1.0.1
+Version:        1.0.4
 Release:        1
 Epoch:          0
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.1.tar.bz2
+Source0:        http://dl.sourceforge.net/sylpheed-claws/sylpheed-claws-1.0.4.tar.bz2
 Source1:        sylpheed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -25,13 +22,11 @@
 BuildRequires:  gdk-pixbuf-devel
 BuildRequires:  clamav-devel
 BuildRequires:  gnupg >= 0:1.2.1, gpgme03-devel >= 0:0.3.12
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils startup-notification-devel
 BuildRequires:  pkgconfig
 Requires:  spamassassin
 Requires:  dillo
 
-Conflicts: sylpheed
-
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast 
 e-mail client.
@@ -48,13 +43,9 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
-# -----------------------------------------------------------------------------
-
 %prep
 %setup
 
-# -----------------------------------------------------------------------------
-
 %build
 %if %openssl_pc
 MY_OPENSSL_CFLAGS=`pkg-config openssl --cflags`
@@ -64,18 +55,15 @@
            --enable-ldap --enable-jpilot \
            --enable-spamassassin-plugin \
            --disable-mathml-viewer-plugin \
-%if "%{aspellver}" >= "0.50"
 	   --enable-aspell \
-%endif
-           --disable-dependency-tracking
+           --disable-dependency-tracking \
+	   --program-suffix="-claws"
 
 %{__make} %{?_smp_mflags}
 
 %{__make} check
 
 
-# -----------------------------------------------------------------------------
-
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %makeinstall gnomedatadir=${RPM_BUILD_ROOT}/%{_datadir}
@@ -89,16 +77,14 @@
 
 %{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
-%{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/sylpheed/plugins/*.a
+
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
-# -----------------------------------------------------------------------------
+%{__mv} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/sylpheed{,-claws}.png
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-# -----------------------------------------------------------------------------
-
 %files -f sylpheed-claws.lang
 %defattr(-,root,root,-)
 %doc ABOUT-NLS AUTHORS ChangeLog ChangeLog.claws COPYING
@@ -107,7 +93,8 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*
+%{_libdir}/sylpheed-claws/plugins/*.so
+%exclude %{_libdir}/sylpheed-claws/plugins/*.a
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/sylpheed-claws/
 %{_datadir}/sylpheed-claws/*
@@ -120,9 +107,13 @@
 %{_includedir}/sylpheed-claws/*
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Thu Apr 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0:1.0.4-1
+- Version upgrade (security fixes)
+- specfile cleanups
+- remove aspell version check
+
 * Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:1.0.1-1
 - version upgrade