2.31.4
This commit is contained in:
parent
ac9ca9d003
commit
37afdc112c
@ -1 +1 @@
|
|||||||
yelp-2.30.1.tar.bz2
|
yelp-2.31.4.tar.bz2
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
afd638cdaea1fcb9821ece88b819a022 yelp-2.30.1.tar.bz2
|
b9ba3e6338a1237c6f8c1ff0aca10d3c yelp-2.31.4.tar.bz2
|
||||||
|
136
yelp.spec
136
yelp.spec
@ -1,108 +1,67 @@
|
|||||||
%global WITH_MONO 0
|
%define glib2_version 2.25.3
|
||||||
%{?!WITH_MONO: %global WITH_MONO 1}
|
|
||||||
%ifarch ppc64 s390 s390x
|
|
||||||
%define WITH_MONO 0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Last updated for 2.29.4
|
|
||||||
%define gnome_doc_utils_version 0.19.1
|
|
||||||
%define gtk2_version 2.18.0
|
%define gtk2_version 2.18.0
|
||||||
%define libxml_version 2.6.5
|
%define libxml_version 2.6.5
|
||||||
%define libxslt_version 1.1.4
|
%define libxslt_version 1.1.4
|
||||||
%define startup_notification_version 0.8
|
|
||||||
%define rarian_version 0.7.0
|
|
||||||
%define gecko_version 1.9.1
|
|
||||||
|
|
||||||
%define pango_version 1.0.99
|
|
||||||
%define desktop_file_utils_version 0.3-7
|
|
||||||
|
|
||||||
Summary: Help browser for the GNOME desktop
|
Summary: Help browser for the GNOME desktop
|
||||||
Name: yelp
|
Name: yelp
|
||||||
Version: 2.30.1
|
Version: 2.31.4
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
#VCS: git:git://git.gnome.org/yelp
|
#VCS: git:git://git.gnome.org/yelp
|
||||||
Source: http://download.gnome.org/sources/yelp/2.30/%{name}-%{version}.tar.bz2
|
Source: http://download.gnome.org/sources/yelp/2.31/%{name}-%{version}.tar.bz2
|
||||||
URL: http://live.gnome.org/Yelp
|
URL: http://live.gnome.org/Yelp
|
||||||
Patch1: yelp-2.15.5-fedora-docs.patch
|
|
||||||
Patch2: yelp-2.13.2-add-mime-handling.patch
|
|
||||||
Patch3: yelp-use-pango.patch
|
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=497559
|
|
||||||
# Patch6: hp.patch
|
|
||||||
|
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=431077
|
|
||||||
# XXX Does this no longer apply to yelp >= 2.19.1 ?
|
|
||||||
#Patch8: yelp-2.18.1-posix-man.patch
|
|
||||||
|
|
||||||
# Patch12: libxul.patch
|
|
||||||
|
|
||||||
# http://bugzilla.gnome.org/show_bug.cgi?id=592762
|
|
||||||
Patch13: ellipsis.patch
|
|
||||||
|
|
||||||
Patch14: libs.patch
|
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
Requires: docbook-dtds
|
Requires: docbook-dtds
|
||||||
Requires: gecko-libs >= %{gecko_version}
|
|
||||||
Requires: libxslt >= %{libxslt_version}
|
|
||||||
Requires: gnome-doc-utils-stylesheets >= %{gnome_doc_utils_version}
|
|
||||||
Requires: gnome-user-docs
|
Requires: gnome-user-docs
|
||||||
Requires: rarian >= %{rarian_version}
|
Requires: yelp-xsl
|
||||||
Requires(pre): GConf2
|
|
||||||
Requires(post): GConf2
|
|
||||||
Requires(preun): GConf2
|
|
||||||
Requires(post): desktop-file-utils
|
Requires(post): desktop-file-utils
|
||||||
Requires(postun): desktop-file-utils
|
Requires(postun): desktop-file-utils
|
||||||
|
|
||||||
BuildRequires: pango-devel >= %{pango_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
BuildRequires: gtk2-devel >= %{gtk2_version}
|
BuildRequires: gtk2-devel >= %{gtk2_version}
|
||||||
BuildRequires: gecko-devel-unstable >= %{gecko_version}
|
|
||||||
BuildRequires: libxml2-devel >= %{libxml_version}
|
BuildRequires: libxml2-devel >= %{libxml_version}
|
||||||
BuildRequires: libxslt-devel >= %{libxslt_version}
|
BuildRequires: libxslt-devel >= %{libxslt_version}
|
||||||
BuildRequires: libgcrypt-devel
|
BuildRequires: dbus-glib-devel
|
||||||
BuildRequires: fontconfig
|
BuildRequires: webkitgtk-devel
|
||||||
BuildRequires: GConf2-devel
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
BuildRequires: yelp-xsl-devel
|
||||||
BuildRequires: gnome-doc-utils-stylesheets >= %{gnome_doc_utils_version}
|
BuildRequires: xz-devel
|
||||||
BuildRequires: startup-notification-devel >= %{startup_notification_version}
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: libXt-devel
|
|
||||||
BuildRequires: dbus-devel
|
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: rarian-devel >= %{rarian_version}
|
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: gnome-common
|
BuildRequires: gnome-common
|
||||||
|
BuildRequires: intltool
|
||||||
BuildRequires: automake autoconf libtool
|
BuildRequires: automake autoconf libtool
|
||||||
|
|
||||||
%if %{WITH_MONO}
|
|
||||||
BuildRequires: libbeagle-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Yelp is the help browser for the GNOME desktop. It is designed
|
Yelp is the help browser for the GNOME desktop. It is designed
|
||||||
to help you browse all the documentation on your system in
|
to help you browse all the documentation on your system in
|
||||||
one central tool, including traditional man pages, info pages and
|
one central tool, including traditional man pages, info pages and
|
||||||
documentation written in DocBook.
|
documentation written in DocBook.
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: Libraries for yelp
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description libs
|
||||||
|
This package contains libraries used by the yelp help browser.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development files for yelp-libs
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
This package contains header files and documentation for
|
||||||
|
the libraries in the yelp-libs package.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .fedora-docs
|
|
||||||
%patch2 -p1 -b .add-mime-handling
|
|
||||||
%patch3 -p1 -b .use-pango
|
|
||||||
#%patch6 -p1 -b .hp
|
|
||||||
#%patch12 -p1 -b .libxul
|
|
||||||
%patch13 -p1 -b .ellipsis
|
|
||||||
%patch14 -p1 -b .libs
|
|
||||||
|
|
||||||
# force regeneration
|
|
||||||
rm data/yelp.schemas
|
|
||||||
|
|
||||||
autoreconf -i -f -i
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure
|
||||||
--with-mozilla=libxul-embedding \
|
|
||||||
--disable-schemas-install
|
|
||||||
|
|
||||||
# drop unneeded direct library deps with --as-needed
|
# drop unneeded direct library deps with --as-needed
|
||||||
# libtool doesn't make this easy, so we do it the hard way
|
# libtool doesn't make this easy, so we do it the hard way
|
||||||
@ -113,6 +72,9 @@ make %{?_smp_mflags}
|
|||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
rm $RPM_BUILD_ROOT%{_libdir}/libyelp.a
|
||||||
|
rm $RPM_BUILD_ROOT%{_libdir}/libyelp.la
|
||||||
|
|
||||||
desktop-file-install --vendor gnome --delete-original \
|
desktop-file-install --vendor gnome --delete-original \
|
||||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||||
--remove-category Application \
|
--remove-category Application \
|
||||||
@ -123,37 +85,47 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/gnome/help
|
|||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%gconf_schema_upgrade yelp
|
|
||||||
update-desktop-database &> /dev/null ||:
|
update-desktop-database &> /dev/null ||:
|
||||||
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
||||||
|
|
||||||
%pre
|
|
||||||
%gconf_schema_prepare yelp
|
|
||||||
|
|
||||||
%preun
|
|
||||||
%gconf_schema_remove yelp
|
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
update-desktop-database &> /dev/null ||:
|
update-desktop-database &> /dev/null ||:
|
||||||
|
glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
||||||
if [ $1 -eq 0 ]; then
|
if [ $1 -eq 0 ]; then
|
||||||
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
||||||
gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
|
gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
|
glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
||||||
gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
|
gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root,-)
|
||||||
%doc ChangeLog AUTHORS COPYING MAINTAINERS NEWS README
|
%doc ChangeLog AUTHORS COPYING MAINTAINERS NEWS README
|
||||||
%{_sysconfdir}/gconf/schemas/yelp.schemas
|
|
||||||
%{_bindir}/*
|
%{_bindir}/*
|
||||||
%{_datadir}/applications/*
|
%{_datadir}/applications/*
|
||||||
%dir %{_datadir}/gnome/help
|
%dir %{_datadir}/gnome/help
|
||||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||||
%{_datadir}/yelp
|
%{_datadir}/yelp
|
||||||
|
%{_datadir}/glib-2.0/schemas/org.gnome.yelp.gschema.xml
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_libdir}/libyelp.so.*
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{_libdir}/libyelp.so
|
||||||
|
%{_includedir}/libyelp
|
||||||
|
%{_datadir}/gtk-doc/html/libyelp
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 27 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.4-1
|
||||||
|
- Update to 2.31.4
|
||||||
|
|
||||||
* Mon May 24 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-2
|
* Mon May 24 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-2
|
||||||
- Require gnome-user-docs so that Help->Contents works.
|
- Require gnome-user-docs so that Help->Contents works.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user