rpms/sylpheed/devel sylpheed-3.0.0-dsofix.patch, NONE, 1.1 sylpheed-3.0.0-no-update-check.patch, NONE, 1.1 .cvsignore, 1.45, 1.46 sources, 1.45, 1.46 sylpheed-2.5.0-desktop.patch, 1.1, 1.2 sylpheed.spec, 1.105, 1.106 sylpheed-2.5.0-prefs_common.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Fri Feb 26 01:56:29 UTC 2010
- Previous message: rpms/sylpheed/F-13 sylpheed-3.0.0-dsofix.patch, NONE, 1.1 sylpheed-3.0.0-no-update-check.patch, NONE, 1.1 .cvsignore, 1.45, 1.46 sources, 1.45, 1.46 sylpheed.spec, 1.105, 1.106 sylpheed-2.5.0-prefs_common.patch, 1.1, NONE
- Next message: rpms/sylpheed/F-13 sylpheed-2.5.0-desktop.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9736/devel
Modified Files:
.cvsignore sources sylpheed-2.5.0-desktop.patch sylpheed.spec
Added Files:
sylpheed-3.0.0-dsofix.patch
sylpheed-3.0.0-no-update-check.patch
Removed Files:
sylpheed-2.5.0-prefs_common.patch
Log Message:
* Fri Feb 26 2010 Christoph Wickert <cwickert at fedoraproject.org> - 3.0.0-4
- Update to 3.0.0 final
- Add patch to fix DSO linking (#565108)
- Add some more %doc files
- Use new layout of the folder view (don't display message numbers in colums)
- Disable update check by default
sylpheed-3.0.0-dsofix.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE sylpheed-3.0.0-dsofix.patch ---
--- sylpheed-3.0.0.orig/src/Makefile.in 2010-02-24 05:18:22.000000000 +0100
+++ sylpheed-3.0.0/src/Makefile.in 2010-02-26 02:40:42.000000000 +0100
@@ -96,7 +96,7 @@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDAP_LIBS = @LDAP_LIBS@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lenchant
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
sylpheed-3.0.0-no-update-check.patch:
prefs_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE sylpheed-3.0.0-no-update-check.patch ---
--- sylpheed-3.0.0.orig/libsylph/prefs_common.c 2010-02-16 08:42:25.000000000 +0100
+++ sylpheed-3.0.0/libsylph/prefs_common.c 2010-02-26 01:53:43.000000000 +0100
@@ -475,7 +475,7 @@
P_STRING},
/* Update check */
- {"auto_update_check", "TRUE", &prefs_common.auto_update_check, P_BOOL},
+ {"auto_update_check", "FALSE", &prefs_common.auto_update_check, P_BOOL},
{"use_http_proxy", "FALSE", &prefs_common.use_http_proxy, P_BOOL},
{"http_proxy_host", NULL, &prefs_common.http_proxy_host, P_STRING},
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore 1 Feb 2010 18:41:35 -0000 1.45
+++ .cvsignore 26 Feb 2010 01:56:29 -0000 1.46
@@ -1 +1 @@
-sylpheed-3.0.0beta7.tar.bz2
+sylpheed-3.0.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources 1 Feb 2010 18:41:35 -0000 1.45
+++ sources 26 Feb 2010 01:56:29 -0000 1.46
@@ -1 +1 @@
-415bd8dd29ab84d6e55e3203023961cf sylpheed-3.0.0beta7.tar.bz2
+bb2cf4adfa9577746f54a516e9471bfd sylpheed-3.0.0.tar.bz2
sylpheed-2.5.0-desktop.patch:
sylpheed.desktop | 2 ++
1 file changed, 2 insertions(+)
Index: sylpheed-2.5.0-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed-2.5.0-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sylpheed-2.5.0-desktop.patch 28 Aug 2008 16:25:01 -0000 1.1
+++ sylpheed-2.5.0-desktop.patch 26 Feb 2010 01:56:29 -0000 1.2
@@ -1,8 +1,9 @@
diff -Nur sylpheed-2.5.0-orig/sylpheed.desktop sylpheed-2.5.0/sylpheed.desktop
--- sylpheed-2.5.0-orig/sylpheed.desktop 2008-06-17 04:19:52.000000000 +0200
+++ sylpheed-2.5.0/sylpheed.desktop 2008-08-28 18:18:20.000000000 +0200
-@@ -12,3 +12,4 @@
+@@ -12,3 +12,5 @@
Terminal=false
Type=Application
Categories=GTK;Network;Email;News;
++StartupNotify=true
+StartupWMClass=sylpheed
Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- sylpheed.spec 1 Feb 2010 18:41:35 -0000 1.105
+++ sylpheed.spec 26 Feb 2010 01:56:29 -0000 1.106
@@ -2,40 +2,44 @@
# people who have linked the desktop icon
%global desktopvendor redhat
-%global tarversion 3.0.0beta7
+%global tarversion 3.0.0
-Summary: GTK+ based, lightweight, and fast email client
-Name: sylpheed
-Version: 3.0.0
-Release: 3.0.beta7%{?dist}
-License: GPLv2+
-URL: http://sylpheed.sraoss.jp/
-Group: Applications/Internet
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-BuildRequires: gtk2-devel openssl-devel
-BuildRequires: desktop-file-utils pkgconfig gettext xdg-utils
+Name: sylpheed
+Version: 3.0.0
+Release: 4%{?dist}
+Summary: GTK+ based, lightweight, and fast email client
+
+Group: Applications/Internet
+License: GPLv2+
+URL: http://sylpheed.sraoss.jp/
+Source0: http://sylpheed.sraoss.jp/sylpheed/v3.0/%{name}-%{tarversion}.tar.bz2
+Source1: sylpheed.1
+
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRequires: gtk2-devel openssl-devel
+BuildRequires: desktop-file-utils pkgconfig gettext xdg-utils
%{!?_without_gpgme:BuildRequires: gpgme-devel}
%{!?_without_compface:BuildRequires: compface-devel}
%{!?_without_ldap:BuildRequires: openldap-devel}
%{?_with_oniguruma:BuildRequires: oniguruma-devel}
%{?_with_jpilot:BuildRequires: jpilot-devel}
-BuildRequires: gtkspell-devel
+BuildRequires: gtkspell-devel
%if 0%{?fedora} > 8
-BuildRequires: enchant-devel
+BuildRequires: enchant-devel
%endif
-Source0: http://sylpheed.sraoss.jp/sylpheed/v2.6/%{name}-%{tarversion}.tar.bz2
-Source1: sylpheed.1
+# fix implicit DSO linking (#565108)
+Patch0: sylpheed-3.0.0-dsofix.patch
# customisations for default program paths
-Patch1: sylpheed-2.4.6-defs.h.patch
+Patch1: sylpheed-2.4.6-defs.h.patch
# customisations in the .desktop file
-Patch2: sylpheed-2.5.0-desktop.patch
+Patch2: sylpheed-2.5.0-desktop.patch
# customisation for /etc/pki/tls/
-Patch3: sylpheed-2.5.0-certsdir.patch
-# customisation for default Folder View preferences to mimic older Sylpheed
-Patch4: sylpheed-2.5.0-prefs_common.patch
+Patch3: sylpheed-2.5.0-certsdir.patch
+# disable update check by default
+Patch4: sylpheed-3.0.0-no-update-check.patch
-# For xdg-open in patch1.
+# For xdg-open in patch1
Requires: xdg-utils
%description
@@ -79,10 +83,12 @@ this package contains development files
%prep
%setup -q -n sylpheed-%{tarversion}
+%patch0 -p1 -b .dsofix
%patch1 -p1 -b .defs.h
%patch2 -p1 -b .desktop
%patch3 -p1 -b .certsdir
-#%patch4 -p1 -b .prefs_common
+%patch4 -p1 -b .no-update-check
+
%build
%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -99,10 +105,11 @@ echo "#define USE_ENCHANT 1" >> config.h
%endif
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -110,28 +117,28 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/appl
install -p -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
desktop-file-install --vendor %{desktopvendor} \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- --add-category Network \
--delete-original \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
%find_lang %{name}
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc COPYING COPYING.LIB LICENSE
-%doc ChangeLog README INSTALL TODO
-%doc ChangeLog.ja README.ja INSTALL.ja TODO.ja
-%doc README.es
-%doc AUTHORS NEWS
+%doc AUTHORS ChangeLog ChangeLog-1.0 COPYING COPYING.LIB LICENSE
+%doc NEWS NEWS-1.0 NEWS-2.0 README TODO
+%lang(ja) %doc ChangeLog.ja ChangeLog-1.0.ja README.ja INSTALL.ja TODO.ja
+%lang(es) %doc README.es
%{_bindir}/sylpheed
%{_datadir}/sylpheed/
%{_datadir}/applications/%{desktopvendor}-%{name}.desktop
@@ -142,11 +149,19 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%doc PLUGIN.txt PLUGIN.ja.txt
+%doc PLUGIN.txt
+%lang(ja) %doc PLUGIN.ja.txt
%{_includedir}/sylpheed/
%{_libdir}/*.so
%changelog
+* Fri Feb 26 2010 Christoph Wickert <cwickert at fedoraproject.org> - 3.0.0-4
+- Update to 3.0.0 final
+- Add patch to fix DSO linking (#565108)
+- Add some more %%doc files
+- Use new layout of the folder view (don't display message numbers in colums)
+- Disable update check by default
+
* Mon Feb 01 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.0.0-3.0.beta7
- sylpheed-3.0.0beta7
--- sylpheed-2.5.0-prefs_common.patch DELETED ---
- Previous message: rpms/sylpheed/F-13 sylpheed-3.0.0-dsofix.patch, NONE, 1.1 sylpheed-3.0.0-no-update-check.patch, NONE, 1.1 .cvsignore, 1.45, 1.46 sources, 1.45, 1.46 sylpheed.spec, 1.105, 1.106 sylpheed-2.5.0-prefs_common.patch, 1.1, NONE
- Next message: rpms/sylpheed/F-13 sylpheed-2.5.0-desktop.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list