[ftgl] Don't put ~rc5 in the pkg-config version string - rhbz#843460
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Jul 26 15:30:17 UTC 2012
commit 97d9e3cca3c4c12c4522fe18cd1e470fb5b7e0e9
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Jul 26 17:35:17 2012 +0200
Don't put ~rc5 in the pkg-config version string - rhbz#843460
ftgl.spec | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/ftgl.spec b/ftgl.spec
index 455fca0..feb451e 100644
--- a/ftgl.spec
+++ b/ftgl.spec
@@ -1,6 +1,6 @@
Name: ftgl
Version: 2.1.3
-Release: 0.6.rc5%{?dist}
+Release: 0.7.rc5%{?dist}
Summary: OpenGL frontend to Freetype 2
Group: System Environment/Libraries
@@ -9,7 +9,6 @@ URL: http://ftgl.wiki.sourceforge.net/
Source0: http://downloads.sourceforge.net/ftgl/ftgl-%{version}-rc5.tar.bz2
Patch0: ftgl-2.1.3-rc5-ttf_font.patch
Patch1: ftgl-2.1.3-rc5-ldflags.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
@@ -68,11 +67,15 @@ This package contains documentation files for %{name}.
--with-glut-lib=%{_libdir} \
--with-x
+# Remove the ~rc5 from the pc file, as this causes rpm to add a
+# Requires: rpmlib(TildeInVersions) <= 4.10.0-1
+# Which breaks installing ftgl-devel into a koji buildroot (rhbz#843460)
+sed -i 's/2\.1\.3~rc5/2.1.3/' ftgl.pc
+
make all %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT __doc
make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -82,31 +85,28 @@ install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/ftgl/html/* __doc/html
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/FTGL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%files docs
-%defattr(-,root,root,-)
%doc __doc/*
%changelog
+* Thu Jul 26 2012 Hans de Goede <hdegoede at redhat.com> - 2.1.3-0.7.rc5
+- Don't put ~rc5 in the pkg-config version string - rhbz#843460
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-0.6.rc5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list