rpms/k3d/devel .cvsignore, 1.12, 1.13 k3d.spec, 1.41, 1.42 sources, 1.12, 1.13 k3d-0.7.10.0-warn.patch, 1.1, NONE k3d-0.7.11.0-fontpath.patch, 1.1, NONE k3d-0.7.11.0-gcc44.patch, 1.1, NONE k3d-0.7.11.0-potfiles.patch, 1.1, NONE
corsepiu
corsepiu at fedoraproject.org
Fri May 14 14:03:02 UTC 2010
Author: corsepiu
Update of /cvs/pkgs/rpms/k3d/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11912
Modified Files:
.cvsignore k3d.spec sources
Removed Files:
k3d-0.7.10.0-warn.patch k3d-0.7.11.0-fontpath.patch
k3d-0.7.11.0-gcc44.patch k3d-0.7.11.0-potfiles.patch
Log Message:
* Fri May 14 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.8.0.1-1
- Upstream update.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 23 Mar 2009 07:29:13 -0000 1.12
+++ .cvsignore 14 May 2010 14:02:59 -0000 1.13
@@ -1 +1 @@
-k3d-source-0.7.11.0.tar.gz
+k3d-source-0.8.0.1.tar.bz2
Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- k3d.spec 8 Mar 2010 05:47:47 -0000 1.41
+++ k3d.spec 14 May 2010 14:03:02 -0000 1.42
@@ -1,17 +1,13 @@
Name: k3d
-Version: 0.7.11.0
-Release: 7%{?dist}
+Version: 0.8.0.1
+Release: 1%{?dist}
Summary: A 3D Modeling, Animation and Rendering System
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.k-3d.org/
-Source0: http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.bz2
Source1: k3d.desktop
-Patch0: k3d-0.7.11.0-potfiles.patch
-Patch1: k3d-0.7.10.0-warn.patch
-Patch2: k3d-0.7.11.0-fontpath.patch
-Patch3: k3d-0.7.11.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This list is alpha sorted.
@@ -35,10 +31,31 @@ BuildRequires: pkgconfig(uuid)
BuildRequires: plib-devel
BuildRequires: python-devel
+# Text widget uses bitstream font by default
+BuildRequires: /usr/share/fonts/bitstream-vera/Vera.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraBI.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraBd.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraIt.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoBI.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoBd.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraMoIt.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraMono.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraSe.ttf
+BuildRequires: /usr/share/fonts/bitstream-vera/VeraSeBd.ttf
+
Requires: aqsis
# Text widget uses bitstream font by default
-Requires: bitstream-vera-sans-fonts
+Requires: /usr/share/fonts/bitstream-vera/Vera.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraBI.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraBd.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraIt.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraMoBI.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraMoBd.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraMoIt.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraMono.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraSe.ttf
+Requires: /usr/share/fonts/bitstream-vera/VeraSeBd.ttf
Requires(post): /sbin/ldconfig
Requires(post): desktop-file-utils
@@ -69,10 +86,8 @@ rendering a model written by K-3D.
%prep
%setup -q -n k3d-source-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%{?fc12:%patch0 -p1}
+
rm -f CMakeCache.txt
find . \( -type f -a -executable \) -exec chmod -x "{}" \;
@@ -94,10 +109,12 @@ rm -rf $RPM_BUILD_ROOT
cd BUILD
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
-# Workaround for install bug
-rm -f $RPM_BUILD_ROOT%{_datadir}/k3d/locale/chef/LC_MESSAGES/k3d.mo
-# Remove fonts, we use Fedora-shipped fonts instead
-rm -fr $RPM_BUILD_ROOT%{_datadir}/k3d/fonts
+
+# FIXEM: Use Fedora-shipped fonts
+for f in $RPM_BUILD_ROOT%{_datadir}/k3d/fonts/Vera*.ttf; do
+b=$(basename "$f"); rm -f "$f"
+ln -s /usr/share/fonts/bitstream-vera/$b "$f";
+done
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -124,38 +141,35 @@ update-desktop-database %{_datadir}/appl
/sbin/ldconfig
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING README
%{_bindir}/k3d*
%dir %{_libdir}/k3d
%{_libdir}/k3d/plugins
-%{_libdir}/k3d/uiplugins
%{_libdir}/*.so
%dir %{_datadir}/k3d
%{_datadir}/k3d/*.k3d
%{_datadir}/k3d/documents
+%{_datadir}/k3d/geometry
+%{_datadir}/k3d/fonts
%{_datadir}/k3d/icons
%{_datadir}/k3d/locale
%{_datadir}/k3d/logo
%{_datadir}/k3d/lsystem
%{_datadir}/k3d/ngui
-%{_datadir}/k3d/qtui
%{_datadir}/k3d/scripts
%dir %{_datadir}/k3d/shaders
-%{_datadir}/k3d/shaders/displacemnt
+%{_datadir}/k3d/shaders/displacement
%{_datadir}/k3d/shaders/glsl
%{_datadir}/k3d/shaders/imager
%{_datadir}/k3d/shaders/light
%{_datadir}/k3d/shaders/surface
%{_datadir}/k3d/shaders/volume
%{_datadir}/k3d/textures
-%{_datadir}/k3d/tutorials
%{_mandir}/man1/k3d*
%{_datadir}/applications/*.desktop
-
%files devel
%defattr(-, root, root, -)
%{_includedir}/k3d
@@ -164,6 +178,9 @@ update-desktop-database %{_datadir}/appl
%changelog
+* Fri May 14 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.8.0.1-1
+- Upstream update.
+
* Mon Mar 08 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-7
- Rebuild for ImageMagick SONAME change.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 23 Mar 2009 07:29:14 -0000 1.12
+++ sources 14 May 2010 14:03:02 -0000 1.13
@@ -1 +1 @@
-f01b6b0f32845dcd56cd74bfa7c70465 k3d-source-0.7.11.0.tar.gz
+88027c4d43583df2496c25576d0f31b6 k3d-source-0.8.0.1.tar.bz2
--- k3d-0.7.10.0-warn.patch DELETED ---
--- k3d-0.7.11.0-fontpath.patch DELETED ---
--- k3d-0.7.11.0-gcc44.patch DELETED ---
--- k3d-0.7.11.0-potfiles.patch DELETED ---
More information about the scm-commits
mailing list