rpms/sylpheed/devel sylpheed-0.8.9-ck.patch, NONE, 1.1 sylpheed-0.8.9-ssl.patch, NONE, 1.1 sylpheed-default-browser.patch, NONE, 1.1 sylpheed.1, NONE, 1.1 sylpheed.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Fri Mar 4 23:46:13 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20282/devel
Modified Files:
.cvsignore sources
Added Files:
sylpheed-0.8.9-ck.patch sylpheed-0.8.9-ssl.patch
sylpheed-default-browser.patch sylpheed.1 sylpheed.spec
Log Message:
auto-import sylpheed-1.0.0-1 on branch devel from sylpheed-1.0.0-1.src.rpm
(last version from Fedora Core Development)
sylpheed-0.8.9-ck.patch:
--- NEW FILE sylpheed-0.8.9-ck.patch ---
--- sylpheed-0.8.9/po/zh_CN.po.ck 2002-11-15 16:48:18.000000000 +0900
+++ sylpheed-0.8.9/po/zh_CN.po 2002-12-12 17:03:23.000000000 +0900
@@ -5938,5 +5938,8 @@
msgid "Open URI command line is invalid: `%s'"
msgstr "´ò¿ªURLµÄÃüÁîÐÐÎÞЧ£º `%s'"
+msgid "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+msgstr "-*-*-medium-r-normal--16-*-*-*-*-*-*-*"
+
#~ msgid "Done"
#~ msgstr "Íê³É"
--- sylpheed-0.8.9/po/ko.po.ck 2002-12-25 16:32:26.000000000 +0900
+++ sylpheed-0.8.9/po/ko.po 2003-01-07 17:30:57.000000000 +0900
@@ -5881,6 +5881,9 @@
msgid "Open URI command line is invalid: `%s'"
msgstr "URI¿±â ¸í·É¾î°¡ ¿Ã¹Ù¸£Áö¾Ê½À´Ï´Ù: `%s'"
+msgid "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"
+msgstr "-*-*-medium-r-normal--16-*-*-*-*-*-*-*"
+
#~ msgid "\tSearching uncached messages... "
#~ msgstr "\tij½¬µÇÁö¾ÊÀº ¸Þ½ÃÁö¸¦ ã½À´Ï´Ù... "
--- sylpheed-0.8.9/src/prefs.c.orig 2003-01-20 18:22:54.000000000 +0900
+++ sylpheed-0.8.9/src/prefs.c 2003-01-20 18:23:46.000000000 +0900
@@ -372,7 +372,7 @@
NULL);
else if (param[i].defval[0] != '\0')
*((gchar **)param[i].data) =
- g_strdup(param[i].defval);
+ g_strdup(_(param[i].defval));
else
*((gchar **)param[i].data) = NULL;
} else
--- sylpheed-0.8.9/src/prefs_common.c.orig 2003-01-20 18:27:42.000000000 +0900
+++ sylpheed-0.8.9/src/prefs_common.c 2003-01-20 18:27:51.000000000 +0900
@@ -337,7 +337,7 @@
/* Display */
{"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
NULL, NULL, NULL},
- {"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
+ {"message_font", N_("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"),
&prefs_common.textfont, P_STRING,
&display.entry_textfont,
prefs_set_data_from_entry, prefs_set_entry},
sylpheed-0.8.9-ssl.patch:
--- NEW FILE sylpheed-0.8.9-ssl.patch ---
diff -ruN sylpheed-0.8.9.orig/aclocal.m4 sylpheed-0.8.9/aclocal.m4
--- sylpheed-0.8.9.orig/aclocal.m4 2003-03-17 22:36:29.000000000 +0900
+++ sylpheed-0.8.9/aclocal.m4 2003-03-17 22:36:39.000000000 +0900
@@ -6825,3 +6825,60 @@
fi
])
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN(PKG_CHECK_MODULES, [
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ 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 -ruN sylpheed-0.8.9.orig/configure.in sylpheed-0.8.9/configure.in
--- sylpheed-0.8.9.orig/configure.in 2003-03-17 22:36:29.000000000 +0900
+++ sylpheed-0.8.9/configure.in 2003-03-17 22:36:58.000000000 +0900
@@ -208,16 +208,15 @@
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([
-#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 ])
+ 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.)
+ else
+ LIBS="$ac_save_LIBS"
+ ac_cv_enable_ssl=no
+ fi
else
AC_MSG_RESULT(no)
fi
sylpheed-default-browser.patch:
--- NEW FILE sylpheed-default-browser.patch ---
diff -ruN sylpheed-1.0.0beta3.orig/src/defs.h sylpheed-1.0.0beta3/src/defs.h
--- sylpheed-1.0.0beta3.orig/src/defs.h 2004-11-22 19:54:58.940918000 +0900
+++ sylpheed-1.0.0beta3/src/defs.h 2004-11-22 19:55:52.459857552 +0900
@@ -70,7 +70,7 @@
/* #define DEFAULT_INC_PATH "/usr/bin/imget" */
/* #define DEFAULT_INC_PROGRAM "imget" */
#define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i"
-#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'"
+#define DEFAULT_BROWSER_CMD "gnome-open '%s'"
#ifdef _PATH_MAILDIR
# define DEFAULT_SPOOL_PATH _PATH_MAILDIR
--- NEW FILE sylpheed.1 ---
.TH SYLPHEED 1 "Nov 22 2004"
.SH NAME
.B sylpheed
\- a GTK+ based, lightweight, and fast email client
.SH SYNOPSIS
.B sylpheed [options]...
.SH DESCRIPTION
\fIsylpheed\fP is an X based fast email client.
.SH OPTIONS
.TP
.B \-\-compose [ADDRESS]
Open the composition window.
.TP
.B \-\-attach [FILE [FILE]...]
Open the composition window with FILE attached.
.TP
.B \-\-receive
Receive the new messages from the server.
.TP
.B \-\-receive-all
Receive the new messages of all accounts from the servers.
.TP
.B \-\-send
Send all queued messages.
.TP
.B \-\-status [FOLDER]
Show the total number of the message.
.TP
.B \-\-status\-full [FOLDER]
Show the status of each folder
.TP
.B \-\-debug
Enter the debug mode.
.TP
.B \-\-help
Show this message.
.TP
.B \-\-version
Show the version.
.SH SEE ALSO
more documentations are available on /usr/share/sylpheed/manual/ and /usr/share/sylpheed/faq/.
.SH AUTHOR
This manual page was written by Akira TAGOH <tagoh at redhat.com>.
--- NEW FILE sylpheed.spec ---
Name: sylpheed
Version: 1.0.0
Release: 1
License: GPL
URL: http://sylpheed.good-day.net/
Group: Applications/Internet
Buildroot: %{_tmppath}/%{name}-root
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
Source1: sylpheed.1
Patch: %{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:
o user-friendly and intuitive interface
o integrated NetNews client (partially implemented)
o ability of keyboard-only operation
o Mew/Wanderlust-like key bind
o multipart MIME
o unlimited multiple account handling
o message queueing
o assortment function
o XML-based address book
See /usr/share/doc/sylpheed*/README for more information.
%prep
%setup -q -n %{name}-%{version}
%patch -p1 -b .ck
%patch1 -p1 -b .ssl
%patch2 -p1 -b .default-browser
%build
autoconf
%configure --enable-ssl %{?_with_gpgme:--enable-gpgme}
make
%install
[ -n "$RPM_BUILD_ROOT" -a "$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 \
--add-category Application \
--add-category Network \
--add-category X-Red-Hat-Extra \
sylpheed.desktop
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
gzip -9 $RPM_BUILD_ROOT%{_mandir}/man1/sylpheed.1
%find_lang %{name}
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,0755)
%doc COPYING ChangeLog ChangeLog.jp README README.jp INSTALL INSTALL.jp TODO.jp
%{_bindir}/sylpheed
%{_datadir}/sylpheed
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man1
%changelog
* Wed Jan 5 2005 Akira TAGOH <tagoh at redhat.com> - 1.0.0-1
- New upstream release.
* Mon Dec 20 2004 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.rc
- New upstream release.
* Mon Nov 22 2004 Akira TAGOH <tagoh at redhat.com> - 1.0.0-0.1.beta3
- New upstream release.
- sylpheed-default-browser.patch: updated to apply cleanly.
- sylpheed.1: added a simple man page. (#129387)
* Wed Jun 23 2004 Akira TAGOH <tagoh at redhat.com> 0.9.12-1
- New upstream release.
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon May 31 2004 Akira TAGOH <tagoh at redhat.com> 0.9.11-1
- New upstream release.
* Wed Mar 24 2004 Akira TAGOH <tagoh at redhat.com> 0.9.10-2
- sylpheed-default-browser.patch: applied to change the default browser to
gnome-open. (#119007, Michael Schwendt)
* Wed Mar 10 2004 Akira TAGOH <tagoh at redhat.com> 0.9.10-1
- New upstream release.
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Akira TAGOH <tagoh at redhat.com> 0.9.9-1
- New upstream release.
* Fri Jan 30 2004 Akira TAGOH <tagoh at redhat.com> 0.9.8a-3
- don't strip the binary. Thanks to Michael Schwendt
- use upstream's icon for the desktop file.
- install the desktop file using desktop-install-file
* Thu Jan 29 2004 Akira TAGOH <tagoh at redhat.com> 0.9.8a-2
- add _with_gpgme to build enabled gpgme support.
NOTE: it's disabled as default. just define _with_gpgme to enable it.
* Tue Dec 16 2003 Akira TAGOH <tagoh at redhat.com> 0.9.8a-1
- New upstream release.
* Thu Oct 16 2003 Akira TAGOH <tagoh at redhat.com> 0.9.7-1
- New upstream release.
* Thu Jul 31 2003 Akira TAGOH <tagoh at redhat.com> 0.9.4-1
- New upstream release.
* Tue Jul 22 2003 Nalin Dahyabhai <nalin at redhat.com> 0.9.3-2
- rebuild
* Wed Jul 09 2003 Akira TAGOH <tagoh at redhat.com> 0.9.3-1
- New upstream release.
* Mon Jun 09 2003 Akira TAGOH <tagoh at redhat.com> 0.9.2-1
- New upstream release.
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Apr 09 2003 Akira TAGOH <tagoh at redhat.com> 0.8.11-1
- New upstream release.
- use the appropriate macros.
* Mon Mar 17 2003 Akira TAGOH <tagoh at redhat.com> 0.8.9-3
- enabled ssl support.
- sylpheed-0.8.9-ssl.patch: applied to fix the include path and links the correct libraries.
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Mon Jan 20 2003 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.9
* Tue Jan 7 2003 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.8
* Thu Dec 12 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.6
* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
- rebuild in current collinst
* Thu Aug 29 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.2 to fix gpg fatal bug
- Fix desktop file (#72882)
* Sat Aug 3 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.1, a bug fix release
* Mon Jul 15 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.8.0
* Fri Jul 12 2002 Yukihiro Nakai <ynakai at redhat.com>
- Apply Japanese utf8 mail patch
* Wed Jul 10 2002 Yukihiro Nakai <ynakai at redhat.com>
- strip the binary
- fix .desktop file (#66460)
* Wed Jun 26 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.7.8
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu Feb 28 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.7.2
- Install .desktop
* Thu Jan 31 2002 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild on new environment.
* Sun Dec 16 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.6.6
* Fri Nov 30 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.6.5
* Thu Aug 2 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add Chinese and Korean fix.
- Use %%find_lang
* Wed Jul 11 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add %%lang
* Mon Jul 9 2001 Yukihiro Nakai <ynakai at redhat.com>
- Update to 0.5.0
* Tue Feb 6 2001 Tim Powers <timp at redhat.com>
- updated to 0.4.61, bug fixes
* Fri Jan 12 2001 Tim Powers <timp at redhat.com>
- updated to 0.4.52
* Thu Nov 16 2000 Tim Powers <timp at redhat.com>
- update to 0.4.4
- built for Powertools 7.1
- quiet setup
- minor specfile cleanup
- snipped some of the really old changelog, was very very long
- include the manual in the file list
- use %%configure and %%makeinstall as well as other predefined RPM
macros whenever possible
* Wed Aug 30 2000 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild on Red Hat Linux 7.0
* Tue Aug 29 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.28
* Fri Aug 25 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.27
* Sat Aug 19 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.26, and modified URL
* Thu Aug 10 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.25
* Fri Aug 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.24
* Sat Jul 24 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.23
* Sat Jul 20 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.22
* Sun Jul 4 2000 Hiroyuki Yamamoto <hiro-y at kcn.ne.jp>
- updated to 0.3.21, and modified Summary
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Mar 2005 23:41:05 -0000 1.1
+++ .cvsignore 4 Mar 2005 23:46:11 -0000 1.2
@@ -0,0 +1 @@
+sylpheed-1.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 4 Mar 2005 23:41:05 -0000 1.1
+++ sources 4 Mar 2005 23:46:11 -0000 1.2
@@ -0,0 +1 @@
+864c4fc581a5ab1c7af5e06153c76769 sylpheed-1.0.0.tar.bz2
More information about the fedora-extras-commits
mailing list