Cosmetic cleanups for bug 880472

This commit is contained in:
Kevin Fenzi 2012-11-27 21:31:47 -07:00
parent c9eeeca59c
commit 8b102f7187

View File

@ -5,7 +5,7 @@
Name: fontforge Name: fontforge
Version: 20120731b Version: 20120731b
Release: 1%{?dist} Release: 2%{?dist}
Summary: Outline and bitmap font editor Summary: Outline and bitmap font editor
Group: Applications/Publishing Group: Applications/Publishing
@ -14,7 +14,6 @@ URL: http://fontforge.sourceforge.net/
Source0: http://downloads.sourceforge.net/fontforge/fontforge_full-%{archive_version}.tar.bz2 Source0: http://downloads.sourceforge.net/fontforge/fontforge_full-%{archive_version}.tar.bz2
Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{archive_version}.tar.bz2 Source2: http://downloads.sourceforge.net/fontforge/fontforge_htdocs-%{archive_version}.tar.bz2
Patch1: fontforge-20090224-pythondl.patch Patch1: fontforge-20090224-pythondl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xdg-utils Requires: xdg-utils
Requires: autotrace Requires: autotrace
@ -33,7 +32,7 @@ BuildRequires: gettext
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: libspiro-devel BuildRequires: libspiro-devel
BuildRequires: python-devel BuildRequires: python2-devel
%description %description
FontForge (former PfaEdit) is a font editor for outline and bitmap FontForge (former PfaEdit) is a font editor for outline and bitmap
@ -79,7 +78,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so} rm -f $RPM_BUILD_ROOT%{_libdir}/libg{draw,unicode}.{la,so}
@ -109,10 +107,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
install -p Packaging/fontforge.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/ install -p Packaging/fontforge.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
%clean
rm -rf $RPM_BUILD_ROOT
%post %post
update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || :
@ -132,7 +126,7 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{gettext_package}.lang %files -f %{gettext_package}.lang
%defattr(0644,root,root,0755) %defattr(-,root,root,-)
%doc AUTHORS LICENSE htdocs %doc AUTHORS LICENSE htdocs
%attr(0755,root,root) %{_bindir}/* %attr(0755,root,root) %{_bindir}/*
%attr(0755,root,root) %{_libdir}/lib*.so.* %attr(0755,root,root) %{_libdir}/lib*.so.*
@ -152,6 +146,9 @@ fi
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Tue Nov 27 2012 Kevin Fenzi <kevin@scrye.com> 20120731b-2
- Cosmetic cleanups for bug 880472
* Thu Aug 02 2012 Paul Flo Williams <paul@frixxon.co.uk> - 20120731b-1 * Thu Aug 02 2012 Paul Flo Williams <paul@frixxon.co.uk> - 20120731b-1
- Update to 20120731b (problem with 64-bit builds in first release) - Update to 20120731b (problem with 64-bit builds in first release)