rpms/pidgin/F-9 .cvsignore, 1.19, 1.20 pidgin.spec, 1.58, 1.59 sources, 1.19, 1.20 pidgin-2.5.1-buddyicon.patch, 1.1, NONE pidgin-2.5.1-gnomeproxy.patch, 1.1, NONE pidgin-2.5.1-msn-hasyou.patch, 1.1, NONE pidgin-2.5.1-nss-ssl.patch, 1.1, NONE
Stu Tomlinson
nosnilmot at fedoraproject.org
Tue Oct 21 00:55:58 UTC 2008
- Previous message (by thread): rpms/pidgin/F-8 .cvsignore, 1.19, 1.20 pidgin.spec, 1.53, 1.54 sources, 1.19, 1.20 pidgin-2.5.1-buddyicon.patch, 1.1, NONE pidgin-2.5.1-gnomeproxy.patch, 1.1, NONE pidgin-2.5.1-msn-hasyou.patch, 1.1, NONE pidgin-2.5.1-nss-ssl.patch, 1.1, NONE
- Next message (by thread): rpms/gnome-utils/devel .cvsignore, 1.67, 1.68 gnome-utils.spec, 1.171, 1.172 sources, 1.71, 1.72
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nosnilmot
Update of /cvs/pkgs/rpms/pidgin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18573/F-9
Modified Files:
.cvsignore pidgin.spec sources
Removed Files:
pidgin-2.5.1-buddyicon.patch pidgin-2.5.1-gnomeproxy.patch
pidgin-2.5.1-msn-hasyou.patch pidgin-2.5.1-nss-ssl.patch
Log Message:
- 2.5.2
- Generate doxygen API documentation (#466693)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 31 Aug 2008 16:06:19 -0000 1.19
+++ .cvsignore 21 Oct 2008 00:55:26 -0000 1.20
@@ -1 +1 @@
-pidgin-2.5.1.tar.bz2
+pidgin-2.5.2.tar.bz2
Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/pidgin.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- pidgin.spec 16 Sep 2008 14:39:19 -0000 1.58
+++ pidgin.spec 21 Oct 2008 00:55:27 -0000 1.59
@@ -13,9 +13,9 @@
# OPTION: gstreamer integration (FC5+)
%define gstreamer_integration 1
# OPTION: NetworkManager integration (FC5+)
-%define nm_integration 1
+%define nm_integration 1
# OPTION: Modular X (FC5+)
-%define modular_x 1
+%define modular_x 1
# OPTION: dbus-glib split (FC6+)
%define dbus_glib_splt 1
# OPTION: Bonjour support (FC6+)
@@ -23,13 +23,15 @@
# OPTION: Meanwhile integration (F6+)
%define meanwhile_integration 1
# OPTION: Perl devel separated out (F7+)
-%define perl_devel_separated 1
+%define perl_devel_separated 1
# OPTION: Perl embed separated out (F8+)
%define perl_embed_separated 1
+# OPTION: generate pidgin API documentation (F8+)
+%define api_docs 1
Name: pidgin
-Version: 2.5.1
-Release: 3%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
License: GPLv2+ and GPLv2 and MIT
# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
# GPLv2 - silc & novell prpls
@@ -62,10 +64,6 @@
Patch0: pidgin-2.4.2-reread-resolvconf.patch
## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.5.1-gnomeproxy.patch
-Patch101: pidgin-2.5.1-buddyicon.patch
-Patch102: pidgin-2.5.1-msn-hasyou.patch
-Patch103: pidgin-2.5.1-nss-ssl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -157,6 +155,9 @@
BuildRequires: perl(ExtUtils::Embed)
%endif
+%if %{api_docs}
+BuildRequires: doxygen
+%endif
%description
Pidgin allows you to talk to anyone using a variety of messaging
@@ -181,7 +182,7 @@
Requires: pkgconfig
Requires: gtk2-devel
Obsoletes: gaim-devel
-Provides: gaim-devel
+Provides: gaim-devel = %{version}-%{release}
%description devel
@@ -288,7 +289,17 @@
documentation, and libraries required for development of Finch scripts
and plugins.
+%if %{api_docs}
+%package -n pidgin-docs
+Summary: API docs for pidgin and libpurple
+Group: Applications/Internet
+Requires: pidgin = %{version}-%{release}
+Provides: libpurple-docs = %{version}-%{release}
+
+%description -n pidgin-docs
+Doxygen generated API documentation.
+%endif
%prep
%setup -q
@@ -296,10 +307,6 @@
%patch0 -p1 -b .resolv
## Patches 100+: To be Included in Future Upstream
-%patch100 -p0 -b .gnomeproxy
-%patch101 -p0 -b .buddyicon
-%patch102 -p0 -b .hasyou
-%patch103 -p0 -b .nss
# Our preferences
cp %{SOURCE1} prefs.xml
@@ -348,6 +355,10 @@
make %{?_smp_mflags}
+%if %{api_docs}
+make docs
+find doc/html -empty -delete
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -383,7 +394,16 @@
%find_lang pidgin
# symlink /usr/bin/gaim to new pidgin name
-ln -sf %{_bindir}/pidgin $RPM_BUILD_ROOT%{_bindir}/gaim
+ln -sf pidgin $RPM_BUILD_ROOT%{_bindir}/gaim
+
+%if %{api_docs}
+rm -rf html
+rm -f doc/html/installdox
+mv doc/html/ html/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/
+ln -sf ../../doc/pidgin-docs-%{version}/html/ \
+ $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/pidgin
+%endif
%pre
if [ "$1" -gt 1 ]; then
@@ -451,6 +471,7 @@
%{_libdir}/pkgconfig/pidgin.pc
%files -f pidgin.lang -n libpurple
+%defattr(-,root,root,-)
%{_libdir}/purple-2/
%{_libdir}/libpurple.so.*
%{_datadir}/sounds/purple/
@@ -472,6 +493,7 @@
%endif
%files -n libpurple-devel
+%defattr(-,root,root,-)
%{_datadir}/aclocal/purple.m4
%{_libdir}/libpurple.so
%{_includedir}/libpurple/
@@ -482,6 +504,7 @@
%if %{perl_integration}
%files -n libpurple-perl
+%defattr(-,root,root,-)
%{_mandir}/man3/Purple*
%{_libdir}/purple-2/perl.so
%{perl_vendorarch}/Purple.pm
@@ -491,9 +514,11 @@
%endif
%files -n libpurple-tcl
+%defattr(-,root,root,-)
%{_libdir}/purple-2/tcl.so
%files -n finch
+%defattr(-,root,root,-)
%{_bindir}/finch
%{_libdir}/finch/
%{_libdir}/gnt/
@@ -501,14 +526,25 @@
%{_mandir}/man1/finch.*
%files -n finch-devel
+%defattr(-,root,root,-)
%{_includedir}/finch/
%{_includedir}/gnt/
%{_libdir}/libgnt.so
%{_libdir}/pkgconfig/gnt.pc
%{_libdir}/pkgconfig/finch.pc
+%if %{api_docs}
+%files -n pidgin-docs
+%defattr(-,root,root,-)
+%doc html
+%{_datadir}/gtk-doc/html/*
+%endif
%changelog
+* Mon Oct 20 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.2-1
+- 2.5.2
+- Generate doxygen API documentation (#466693)
+
* Tue Sep 16 2008 Stu Tomlinson <stu at nosnilmot.com> 2.5.1-3
- Backport fixes from upstream:
Add "Has You:" back to MSN tooltips
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 31 Aug 2008 16:06:19 -0000 1.19
+++ sources 21 Oct 2008 00:55:27 -0000 1.20
@@ -1 +1 @@
-f76c269c02fafee9b45cc2a50b43b1f3 pidgin-2.5.1.tar.bz2
+4a712f6fd3d2e25c07ccff1fc350c6ea pidgin-2.5.2.tar.bz2
--- pidgin-2.5.1-buddyicon.patch DELETED ---
--- pidgin-2.5.1-gnomeproxy.patch DELETED ---
--- pidgin-2.5.1-msn-hasyou.patch DELETED ---
--- pidgin-2.5.1-nss-ssl.patch DELETED ---
- Previous message (by thread): rpms/pidgin/F-8 .cvsignore, 1.19, 1.20 pidgin.spec, 1.53, 1.54 sources, 1.19, 1.20 pidgin-2.5.1-buddyicon.patch, 1.1, NONE pidgin-2.5.1-gnomeproxy.patch, 1.1, NONE pidgin-2.5.1-msn-hasyou.patch, 1.1, NONE pidgin-2.5.1-nss-ssl.patch, 1.1, NONE
- Next message (by thread): rpms/gnome-utils/devel .cvsignore, 1.67, 1.68 gnome-utils.spec, 1.171, 1.172 sources, 1.71, 1.72
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list