devel/sylpheed-claws sylpheed-claws.desktop, NONE, 1.1 sylpheed-claws.spec, 1.4, 1.5 sylpheed.desktop, 1.1, NONE

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Sat Mar 5 07:08:23 UTC 2005


Author: awjb

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

Modified Files:
	sylpheed-claws.spec 
Added Files:
	sylpheed-claws.desktop 
Removed Files:
	sylpheed.desktop 
Log Message:
- more s/sylpheed/sylpheed-claws/ so we don't have to conflict with
  sylpheed anymore



--- NEW FILE sylpheed-claws.desktop ---
[Desktop Entry]
Name=Sylpheed Claws
Name[ja]=Sylpheed Claws
Comment=E-Mail client
Comment[ja]=ÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È
Exec=sylpheed-claws
Icon=sylpheed-claws.png
Terminal=false
Type=Application
Categories=Application;Network;


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed-claws/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	5 Mar 2005 07:08:21 -0000	1.5
@@ -5,14 +5,14 @@
 
 Name:           sylpheed-claws
 Version:        1.0.1
-Release:        1
+Release:        2
 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
-Source1:        sylpheed.desktop
+Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
 BuildRequires:  glib-devel
@@ -30,8 +30,6 @@
 Requires:  spamassassin
 Requires:  dillo
 
-Conflicts: sylpheed
-
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast 
 e-mail client.
@@ -48,13 +46,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`
@@ -67,15 +61,14 @@
 %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}
@@ -92,13 +85,11 @@
 %{__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
@@ -120,9 +111,12 @@
 %{_includedir}/sylpheed-claws/*
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Sat Mar 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0.1-2
+- fixed some sylpheed/sylpheed-claws
+- removed Conflictes sylpheed
+
 * Wed Feb 09 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0:1.0.1-1
 - version upgrade


--- sylpheed.desktop DELETED ---




More information about the fedora-extras-commits mailing list