rpms/k3d/F-12 k3d.spec,1.36,1.37
corsepiu
corsepiu at fedoraproject.org
Tue Feb 9 09:18:40 UTC 2010
- Previous message: rpms/globus-gram-protocol/EL-4 globus-gram-protocol-dep.patch, NONE, 1.1 globus-gram-protocol-typo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gram-protocol.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Next message: File globus_gram_protocol-9.3.tar.gz uploaded to lookaside cache by ellert
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: corsepiu
Update of /cvs/pkgs/rpms/k3d/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6375
Modified Files:
k3d.spec
Log Message:
* Tue Feb 09 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-5
- Switch back to using to using libuuid (Remove k3d-0.7.11.0-ossp-uuid.patch).
- Remove BR: e2fsprogs-devel, librsvg2, libsigc++20-devel, libpng-devel.
* Tue Feb 09 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-4
- Rebase uuid-generation against ossp-uuid (Address FTBS BZ #539048).
- Misc. spec-file clean up.
- Move %%{_libdir}/*.so into base-package (BZ #513773).
- Move %%{_libdir}/k3d/include into devel-package.
- Move %%{_datadir}/k3d/shaders/*.h into devel-package.
Index: k3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3d/F-12/k3d.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- k3d.spec 24 Oct 2009 16:16:41 -0000 1.36
+++ k3d.spec 9 Feb 2010 09:18:40 -0000 1.37
@@ -1,13 +1,12 @@
-
Name: k3d
Version: 0.7.11.0
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: A 3D Modeling, Animation and Rendering System
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.k-3d.org/
-Source0: http://dl.sourceforge.net/k3d/k3d-source-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/k3d/k3d-source-%{version}.tar.gz
Source1: k3d.desktop
Patch0: k3d-0.7.11.0-potfiles.patch
Patch1: k3d-0.7.10.0-warn.patch
@@ -15,34 +14,32 @@ Patch2: k3d-0.7.11.0-fontpath.pa
Patch3: k3d-0.7.11.0-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: aqsis
-
+# This list is alpha sorted.
+BuildRequires: boost-devel
+BuildRequires: bzip2-devel
+BuildRequires: cairomm-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
-BuildRequires: mesa-libGL-devel
BuildRequires: expat-devel
-BuildRequires: libsigc++20-devel
-BuildRequires: gtkmm24-devel
-BuildRequires: gtkglext-devel
-BuildRequires: plib-devel
BuildRequires: freetype-devel
-BuildRequires: python-devel
-BuildRequires: libgnome-devel
BuildRequires: gnome-vfs2-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: libtiff-devel
-BuildRequires: ImageMagick-c++-devel
BuildRequires: graphviz-devel
-BuildRequires: boost-devel
+BuildRequires: gtkglext-devel
+BuildRequires: gtkmm24-devel
BuildRequires: gts-devel
-BuildRequires: librsvg2
-BuildRequires: bzip2-devel
-BuildRequires: e2fsprogs-devel
+BuildRequires: ImageMagick-c++-devel
+BuildRequires: libgnome-devel
+#BuildRequires: libpng-devel
+#BuildRequires: libsigc++20-devel
+BuildRequires: libtiff-devel
BuildRequires: libtool doxygen gettext
-BuildRequires: libpng-devel
-BuildRequires: cairomm-devel
-BuildRequires: uuid-c++-devel
BuildRequires: libuuid-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: plib-devel
+BuildRequires: python-devel
+
+Requires: aqsis
# Text widget uses bitstream font by default
Requires: bitstream-vera-sans-fonts
@@ -76,31 +73,29 @@ rendering a model written by K-3D.
%prep
%setup -q -n k3d-source-%{version}
-%patch0 -p 1 -b .potfiles
-%patch1 -p 1 -b .warn
-%patch2 -p 1 -b .fontpath
-%patch3 -p 1 -b .gcc44
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
rm -f CMakeCache.txt
-
+find . \( -type f -a -executable \) -exec chmod -x "{}" \;
%build
-mkdir b
-cd b
+mkdir BUILD
+cd BUILD
%cmake ..
# Since our cmake macro disables rpath, we need to set some temp
# library paths as the build invokes some built binaries to generate
# proxy files.
-export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/b/lib:%{_builddir}/k3d-source-%{version}/b/lib64:$LD_LIBRARY_PATH
-echo LD_LIBRARY_PATH is $LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=%{_builddir}/k3d-source-%{version}/BUILD/lib:%{_builddir}/k3d-source-%{version}/BUILD/lib64:$LD_LIBRARY_PATH
make VERBOSE=1 %{?_smp_mflags}
-
+cd ..
%install
-find -type f -regex '.*\.\(cpp\|h\|svg\)' -perm +111 -exec chmod -x {} ';'
-
rm -rf $RPM_BUILD_ROOT
-cd b
+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
@@ -118,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
%check
+# FIXME: This doesn't work.
ctest
@@ -135,9 +131,30 @@ update-desktop-database %{_datadir}/appl
%defattr(-, root, root, -)
%doc AUTHORS COPYING README
%{_bindir}/k3d*
-%{_libdir}/*.so*
-%{_libdir}/k3d
-%{_datadir}/k3d
+%dir %{_libdir}/k3d
+%{_libdir}/k3d/plugins
+%{_libdir}/k3d/uiplugins
+%{_libdir}/*.so
+%dir %{_datadir}/k3d
+%{_datadir}/k3d/*.k3d
+%{_datadir}/k3d/documents
+%{_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/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
@@ -145,10 +162,22 @@ update-desktop-database %{_datadir}/appl
%files devel
%defattr(-, root, root, -)
%{_includedir}/k3d
-%{_libdir}/*.so
+%{_libdir}/k3d/include
+%{_datadir}/k3d/shaders/*.h
%changelog
+* Tue Feb 09 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-5
+- Switch back to using to using libuuid (Remove k3d-0.7.11.0-ossp-uuid.patch).
+- Remove BR: e2fsprogs-devel, librsvg2, libsigc++20-devel, libpng-devel.
+
+* Tue Feb 09 2010 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.7.11.0-4
+- Rebase uuid-generation against ossp-uuid (Address FTBS BZ #539048).
+- Misc. spec-file clean up.
+- Move %%{_libdir}/*.so into base-package (BZ #513773).
+- Move %%{_libdir}/k3d/include into devel-package.
+- Move %%{_datadir}/k3d/shaders/*.h into devel-package.
+
* Sat Oct 24 2009 Denis Leroy <denis at poolshark.org> - 0.7.11.0-3
- Rebuilt with uuid BR name fix
- Previous message: rpms/globus-gram-protocol/EL-4 globus-gram-protocol-dep.patch, NONE, 1.1 globus-gram-protocol-typo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gram-protocol.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3
- Next message: File globus_gram_protocol-9.3.tar.gz uploaded to lookaside cache by ellert
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list