[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

devel/sylpheed sylpheed-1.9.10-desktop.patch, 1.1, 1.2 sylpheed-1.9.6-ssl.patch, 1.1, 1.2 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 sylpheed.spec, 1.10, 1.11 sylpheed-0.8.9-ssl.patch, 1.1, NONE sylpheed-1.0.3-desktop.patch, 1.1, NONE



Author: mschwendt

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

Modified Files:
	.cvsignore sources sylpheed.spec 
Added Files:
	sylpheed-1.9.10-desktop.patch sylpheed-1.9.6-ssl.patch 
Removed Files:
	sylpheed-0.8.9-ssl.patch sylpheed-1.0.3-desktop.patch 
Log Message:
merge from sylpheed-1_9_6-devel branch

sylpheed-1.9.10-desktop.patch:

Index: sylpheed-1.9.10-desktop.patch
===================================================================
RCS file: sylpheed-1.9.10-desktop.patch
diff -N sylpheed-1.9.10-desktop.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sylpheed-1.9.10-desktop.patch	8 Jun 2005 18:06:21 -0000	1.2
@@ -0,0 +1,11 @@
+diff -Nur sylpheed-1.9.10-orig/sylpheed.desktop sylpheed-1.9.10/sylpheed.desktop
+--- sylpheed-1.9.10-orig/sylpheed.desktop	2005-04-22 07:07:06.000000000 +0200
++++ sylpheed-1.9.10/sylpheed.desktop	2005-05-13 14:29:25.000000000 +0200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=Sylpheed
++Name=Sylpheed E-Mail
+ Name[ja]=Sylpheed
+ Comment=E-Mail client
+ Comment[fr]=Client de messagerie électronique

sylpheed-1.9.6-ssl.patch:

Index: sylpheed-1.9.6-ssl.patch
===================================================================
RCS file: sylpheed-1.9.6-ssl.patch
diff -N sylpheed-1.9.6-ssl.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sylpheed-1.9.6-ssl.patch	8 Jun 2005 18:06:21 -0000	1.2
@@ -0,0 +1,104 @@
+diff -Nur sylpheed-1.9.6-orig/aclocal.m4 sylpheed-1.9.6/aclocal.m4
+--- sylpheed-1.9.6-orig/aclocal.m4	2005-03-15 06:17:13.000000000 +0100
++++ sylpheed-1.9.6/aclocal.m4	2005-03-21 21:50:17.000000000 +0100
+@@ -8642,3 +8642,60 @@
+     fi
+   ])
+ 
++
++dnl PKG_CHECK_MODULES(EXAMPLE, gtk+-2.0 >= 2.4.0 glib = 2.4.0, action-if, action-not)
++dnl defines EXAMPLE_LIBS, EXAMPLE_CFLAGS, see pkg-config man page
++dnl also defines EXAMPLE_PKG_ERRORS on error
++AC_DEFUN(PKG_CHECK_MODULES, [
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    AC_PATH_PROG(PKG_CONFIG, pkg-config, "")
++  fi
++
++  if test "$PKG_CONFIG" = "no"; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        AC_MSG_CHECKING(for $2)
++
++        if $PKG_CONFIG --exists "$2" ; then
++            AC_MSG_RESULT(yes)
++            succeeded=yes
++
++            AC_MSG_CHECKING($1_CFLAGS)
++            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
++            AC_MSG_RESULT($$1_CFLAGS)
++
++            AC_MSG_CHECKING($1_LIBS)
++            $1_LIBS=`$PKG_CONFIG --libs "$2"`
++            AC_MSG_RESULT($$1_LIBS)
++        else
++            $1_CFLAGS=""
++            $1_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but 
++            ## do set a variable so people can do so.
++            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++            ifelse([$4], ,echo $$1_PKG_ERRORS,)
++        fi
++
++        AC_SUBST($1_CFLAGS)
++        AC_SUBST($1_LIBS)
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig";
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     ifelse([$3], , :, [$3])
++  else
++     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
++  fi
++])
++
++
+diff -Nur sylpheed-1.9.6-orig/configure.in sylpheed-1.9.6/configure.in
+--- sylpheed-1.9.6-orig/configure.in	2005-03-15 06:16:53.000000000 +0100
++++ sylpheed-1.9.6/configure.in	2005-03-21 22:13:20.000000000 +0100
+@@ -185,17 +185,26 @@
+ 	[ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=no])
+ AC_MSG_CHECKING([whether to use OpenSSL])
+ if test $ac_cv_enable_ssl = yes; then
+-	AC_MSG_RESULT(yes)
+-	AC_MSG_CHECKING([if openssl is available])
+-	LIBS="$LIBS -lssl -lcrypto"
+-	AC_TRY_LINK([
++	dnl First search via pkg-config.
++	PKG_CHECK_MODULES(OPENSSL, openssl, [:], [:])
++	if test "x$OPENSSL_LIBS" != "x"; then
++		CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
++		LIBS="$LIBS $OPENSSL_LIBS"
++		AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.)
++		AC_MSG_RESULT(yes)
++	dnl If pkg-config fails, run compile/link test.
++	else
++		LIBS="$LIBS -lssl -lcrypto"
++		AC_TRY_LINK([
+ #include <openssl/opensslv.h>
+-],	[ return OPENSSL_VERSION_NUMBER; ],
+-	[ AC_MSG_RESULT(yes)
+-	  AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
+-	[ AC_MSG_RESULT(no)
+-	  LIBS="$ac_save_LIBS"
+-	  ac_cv_enable_ssl=no ])
++],		  [ return OPENSSL_VERSION_NUMBER; ],
++		  [ AC_MSG_RESULT(yes)
++		  AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
++		  [ AC_MSG_RESULT(no)
++		  LIBS="$ac_save_LIBS"
++		  ac_cv_enable_ssl=no ]
++		)
++	fi
+ else
+ 	AC_MSG_RESULT(no)
+ fi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/sylpheed/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 Mar 2005 16:15:22 -0000	1.4
+++ .cvsignore	8 Jun 2005 18:06:21 -0000	1.5
@@ -1 +1 @@
-sylpheed-1.0.4.tar.bz2
+sylpheed-1.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	24 Mar 2005 16:15:22 -0000	1.4
+++ sources	8 Jun 2005 18:06:21 -0000	1.5
@@ -1 +1 @@
-e47b275c281335d09201503af2115eaa  sylpheed-1.0.4.tar.bz2
+3ebaa7043f704a567791789d068b940c  sylpheed-1.9.12.tar.bz2


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/devel/sylpheed/sylpheed.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sylpheed.spec	14 May 2005 21:48:36 -0000	1.10
+++ sylpheed.spec	8 Jun 2005 18:06:21 -0000	1.11
@@ -4,23 +4,26 @@
 
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
-Version: 1.0.4
-Release: 3.fc4
+Version: 1.9.12
+Release: 1
 License: GPL
 URL: http://sylpheed.good-day.net/
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-BuildPreReq: openssl-devel pkgconfig gtk+-devel gdk-pixbuf-devel desktop-file-utils
+BuildRequires: gtk2-devel >= 2.4, openssl-devel
+BuildRequires: desktop-file-utils pkgconfig gettext
 %{!?_without_gpgme:BuildRequires: gpgme-devel >= 1.0.0}
 %{!?_without_compface:BuildRequires: compface-devel}
-BuildRequires: autoconf gettext
+%{?_with_ldap:BuildRequires: openldap-devel}
+%{?_with_jpilot:BuildRequires: jpilot-devel}
+BuildRequires: autoconf
 Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2
 Source1: sylpheed.1
 
 Patch0: %{name}-0.8.9-ck.patch
-Patch1: %{name}-0.8.9-ssl.patch
+Patch1: sylpheed-1.9.6-ssl.patch
 Patch2: sylpheed-default-browser.patch
-Patch3: sylpheed-1.0.3-desktop.patch
+Patch3: sylpheed-1.9.10-desktop.patch
 
 %description
 This program is an X based fast email client which has features
@@ -39,7 +42,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .ck
+#%patch0 -p1 -b .ck
 %patch1 -p1 -b .ssl
 %patch2 -p1 -b .default-browser
 %patch3 -p1 -b .desktop
@@ -47,7 +50,9 @@
 %build
 autoconf
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
-	%{?_without_compface:--disable-compface}
+	%{?_without_compface:--disable-compface} \
+	%{?_with_ldap:--enable-ldap} \
+	%{?_with_jpilot:--enable-jpilot}
 make %{?_smp_mflags}
 
 %install
@@ -73,7 +78,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYING ChangeLog ChangeLog.jp README README.jp INSTALL INSTALL.jp TODO.jp
+%doc COPYING ChangeLog README INSTALL TODO
+%doc ChangeLog.ja README.ja INSTALL.ja TODO.ja
 %{_bindir}/sylpheed
 %{_datadir}/sylpheed
 %{_datadir}/applications/*
@@ -81,13 +87,26 @@
 %{_mandir}/man1
 
 %changelog
-* Sat May 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-3.fc4
-- rebuilt (after build system had built ppc binaries without gpgme-devel)
+* Mon May 30 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.12-1
+- Update to 1.9.12 to get a bunch of fixes.
 
-* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.4-1.fc4
-- Update to 1.0.4 (minor security fixes).
+* Fri May 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.10-1
+- Update to 1.9.10.
+- Upstream incorporated some desktop file fixes.
+
+* Fri Apr 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.9-1
+- Update to 1.9.9.
+
+* Mon Apr 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.8-1
+- Update to 1.9.8.
+
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.7-1
+- Update to 1.9.7.
 - Patch4 (draftsegf) merged upstream.
 
+* Sun Mar 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.6-1
+- Update to 1.9.6 development release for testing purposes.
+
 * Thu Mar 17 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-2
 - Fix segfault when reopening drafts.
 


--- sylpheed-0.8.9-ssl.patch DELETED ---


--- sylpheed-1.0.3-desktop.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]