rpms/cinepaint/devel cinepaint-0.22-0-icc_helfer_fltk.patch, NONE, 1.1 cinepaint-0.22-0-libdir.patch, NONE, 1.1 cinepaint-0.22-0-nonweak-symbol.patch, NONE, 1.1 cinepaint-0.22-0-pc_req.patch, NONE, 1.1 cinepaint-0.22-0-rm_rpath.patch, NONE, 1.1 cinepaint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Chauvet (kwizart)
fedora-extras-commits at redhat.com
Fri Jul 13 10:17:41 UTC 2007
Author: kwizart
Update of /cvs/extras/rpms/cinepaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2040/devel
Modified Files:
.cvsignore sources
Added Files:
cinepaint-0.22-0-icc_helfer_fltk.patch
cinepaint-0.22-0-libdir.patch
cinepaint-0.22-0-nonweak-symbol.patch
cinepaint-0.22-0-pc_req.patch cinepaint-0.22-0-rm_rpath.patch
cinepaint.spec
Log Message:
Initial import
cinepaint-0.22-0-icc_helfer_fltk.patch:
--- NEW FILE cinepaint-0.22-0-icc_helfer_fltk.patch ---
--- cinepaint-0.22-0/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.debug 2007-03-22 06:30:40.000000000 +0900
+++ cinepaint-0.22-0/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp 2007-05-11 18:28:11.000000000 +0900
@@ -226,7 +226,7 @@
int awake(void)
{
- Fl::awake(0);
+ Fl::awake((void *) 0);
return 0;
}
int leerWait(void) { return 0; }
cinepaint-0.22-0-libdir.patch:
--- NEW FILE cinepaint-0.22-0-libdir.patch ---
--- cinepaint-0.22-0/configure.in.lib64 2007-03-30 14:42:18.000000000 +0200
+++ cinepaint-0.22-0/configure.in 2007-05-14 20:30:51.000000000 +0200
@@ -67,9 +67,9 @@
echo PKG_CONFIG_PATH = $PKG_CONFIG_PATH
echo ""
if test -z "$PKG_CONFIG_PATH"; then
- PKG_CONFIG_PATH="$prefix/lib/pkgconfig:/usr/local/lib/pkgconfig"
+ PKG_CONFIG_PATH="$libdir/pkgconfig"
else
- PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig:/usr/local/lib/pkgconfig"
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$libdir/pkgconfig"
fi
@@ -560,11 +560,11 @@
dnl Set the include directory
AC_MSG_CHECKING(for Python header files)
if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
- PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
+ PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$libdir/$PYVERSION/config"
fi
if test -z "$PYINCLUDE"; then
if test -r $PYPREFIX/include/Py/Python.h; then
- PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
+ PYINCLUDE="-I$PYPREFIX/include/Py -I$libdir/python/lib"
fi
fi
AC_MSG_RESULT($PYINCLUDE)
@@ -573,8 +573,8 @@
AC_MSG_CHECKING(for Python library)
dirs="$PYVERSION/config $PYVERSION/lib python/lib"
for i in $dirs; do
- if test -d $PYEPREFIX/lib/$i; then
- PYLIB="-L$PYEPREFIX/lib/$i"
+ if test -d $libdir/$i; then
+ PYLIB="-L$libdir/$i"
break
fi
done
cinepaint-0.22-0-nonweak-symbol.patch:
--- NEW FILE cinepaint-0.22-0-nonweak-symbol.patch ---
--- cinepaint-0.22-0/lib/Makefile.in.symbol 2007-03-30 21:37:42.000000000 +0900
+++ cinepaint-0.22-0/lib/Makefile.in 2007-05-12 00:17:42.000000000 +0900
@@ -370,7 +370,7 @@
library_includedir = ${pkgincludedir}
library_include_HEADERS = $(wildcard *.h)
-libcinepaint_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):0
+libcinepaint_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):0 $(GTK_LIBS)
INCLUDES = $(X_CFLAGS) -I$(top_srcdir) -I$(includedir) -I../wire -I../fl_i18n
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
--- cinepaint-0.22-0/lib/fl_i18n/Makefile.in.symbol 2007-03-30 21:37:42.000000000 +0900
+++ cinepaint-0.22-0/lib/fl_i18n/Makefile.in 2007-05-12 00:18:05.000000000 +0900
@@ -293,7 +293,7 @@
library_includedir = ${pkgincludedir}
#library_include_HEADERS = fl_i18n.H
-libcinepaint_fl_i18n_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):0
+libcinepaint_fl_i18n_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):0 -lfltk -lpthread
INCLUDES = $(USE_THREADS) $(FLTK_CFLAGS) $(X_CFLAGS) \
-I$(top_srcdir) -I$(includedir)
cinepaint-0.22-0-pc_req.patch:
--- NEW FILE cinepaint-0.22-0-pc_req.patch ---
--- cinepaint-0.22-0/cinepaint-gtk.pc.in.req 2007-03-21 11:51:11.000000000 +0100
+++ cinepaint-0.22-0/cinepaint-gtk.pc.in 2007-06-18 18:45:19.000000000 +0200
@@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=${exec_prefix}/lib
+libdir=@libdir@
includedir=@includedir@/cinepaint
-datarootdir=@datarootdir@
+datarootdir=@datadir@
programdotdir=@programdotdir@
programplugindir=@programplugindir@
programdatadir=@programdatadir@
@@ -11,6 +11,7 @@
Name: cinepaint-gtk
Description: Cinepaint Plug-In Library Using GTK+
Version: @MAJOR_VERSION at .@MINOR_VERSION@
-Libs: -L${libdir} -lcinepaint @GTK_LIBS@
-Cflags: -I${includedir} @GTK_CFLAGS@
+Requires: gtk+-2.0
+Libs: -L${libdir} -lcinepaint
+Cflags: -I${includedir}
cinepaint-0.22-0-rm_rpath.patch:
--- NEW FILE cinepaint-0.22-0-rm_rpath.patch ---
--- cinepaint-0.22-0/cinepainttool.in.orig 2007-03-21 19:51:22.000000000 +0900
+++ cinepaint-0.22-0/cinepainttool.in 2007-06-15 23:56:28.000000000 +0900
@@ -191,8 +191,9 @@
my_gtk_libs="$my_gtk_libs $i"
fi
done
- export `cat @abs_top_srcdir@/lib/libcinepaint.la | grep dlname | sed s/\'//g`
- echo @abs_top_srcdir@/lib/.libs/$dlname $my_gtk_libs
+# export `cat @abs_top_srcdir@/lib/libcinepaint.la | grep dlname | sed s/\'//g`
+# echo @abs_top_srcdir@/lib/.libs/$dlname $my_gtk_libs
+ echo -L at abs_top_srcdir@/lib/.libs -L at abs_top_srcdir@/libhalf/.libs -lcinepaint -lcinepaintHalf $my_gtk_labs
;;
--libs-noui)
glib_ldflags=`echo $gtk_libs | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
--- NEW FILE cinepaint.spec ---
%define cinever_m 0.22
%define cinever %{cinever_m}-1
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: cinepaint
Version: %(echo %{cinever} |sed 's|-|.|')
Release: 1%{?dist}
Summary: CinePaint is a tool for manipulating images
Group: Applications/Multimedia
License: GPL
URL: http://www.cinepaint.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{cinever}.tar.gz
Patch0: cinepaint-0.22-0-icc_helfer_fltk.patch
Patch1: cinepaint-0.22-0-nonweak-symbol.patch
Patch2: cinepaint-0.22-0-rm_rpath.patch
Patch3: cinepaint-0.22-0-pc_req.patch
Patch4: cinepaint-0.22-0-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifnarch %{ix86} ppc
BuildRequires: autoconf
%endif
BuildRequires: desktop-file-utils
BuildRequires: docbook-utils
BuildRequires: flex
BuildRequires: fltk-devel
#BuildRequires: ftgl-devel # Not reviewed yet
BuildRequires: gettext
BuildRequires: gtk2-devel >= 2.10.8
BuildRequires: gutenprint-devel >= 5.0.0
BuildRequires: python-devel
BuildRequires: lcms-devel >= 1.16
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libXmu-devel
BuildRequires: libXpm-devel
BuildRequires: libXxf86vm-devel
BuildRequires: OpenEXR-devel >= 1.4.0
#BuildRequires: oyranos-devel # Not reviewed yet
Requires: freefont
%description
CinePaint is used for motion picture frame-by-frame retouching, dirt removal,
wire rig removal, render repair, background plates, and 3d model textures.
It's been used on many feature films, including The Last Samurai where it was
used to add flying arrows. It's also being used by pro photographers who need
greater color fidelity than is available in other tools.
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: automake
Requires: pkgconfig
Requires: gtk2-devel
%description devel
This package contains development files for %{name}.
%prep
%setup -q -n cinepaint-%{cinever}
%patch0 -p1 -b .compile
%patch1 -p1 -b .symbol
%patch2 -p1 -b .rm_rpath
%patch3 -p1 -b .req
%patch4 -p1 -b .libdir
%ifnarch %{ix86} ppc
autoconf
%endif
for i in AUTHORS COPYING LICENSE README ;do
install -p -m 0644 libhalf/$i $i.libhalf
done
sed -i 's|\r||' NEWS COPYING
# make compile log more verbose
sed -i.debug -e '/SILENT/s|^.*$|:|' plug-ins/icc_examin/icc_examin/configure.sh
# remove rpath
sed -i.rpath -e '/rpath/d' plug-ins/icc_examin/icc_examin/configure
%build
%configure \
--disable-static \
--enable-gtk2 \
--enable-pygimp \
--with-pixmap=%{_datadir}/pixmaps \
--with-python=%{_bindir}/python
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
chmod 755 $RPM_BUILD_ROOT%{_libdir}/cinepaint/%{cinever}/plug-ins/gtkcons.py
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
--delete-original \
--remove-category Application \
--mode 644 \
${RPM_BUILD_ROOT}%{_datadir}/applications/cinepaint.desktop
%find_lang %{name}
%find_lang cinepaint-script-fu
%find_lang cinepaint-std-plugins
%find_lang icc_examin_cp
cat cinepaint-script-fu.lang | grep lang >> %{name}.lang
cat cinepaint-std-plugins.lang | grep lang >> %{name}.lang
cat icc_examin_cp.lang | grep lang >> %{name}.lang
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
/sbin/ldconfig
%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README *.libhalf
%exclude %{_bindir}/cinepainttool
%{_bindir}/*
%{_libdir}/*.so.*
%{_mandir}/man1/*
%{_libdir}/%{name}/
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/
%exclude %{_datadir}/fonts/FreeSans.ttf
%{python_sitelib}/*
%ifarch x86_64 ppc64
%{python_sitearch}/*
%endif
%files devel
%defattr(-, root, root,-)
%{_bindir}/cinepainttool
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}-gtk.pc
%{_includedir}/%{name}/
%{_datadir}/aclocal/%{name}.m4
%changelog
* Tue Jun 19 2007 kwizart < kwizart at gmail.com > - 0.22.1-1
- Update to 0.22-1
- Moved cinepainttool in -devel
* Mon Jun 18 2007 kwizart < kwizart at gmail.com > - 0.22.0-6
- Add patch to remove rpath
- Uses autoconf on everything exept i386 ppc (libdir)
* Sun Jun 10 2007 kwizart < kwizart at gmail.com > - 0.22.0-5
- Removed remaining rpaths with chrpath
(this will allow icc_examin to build)
* Mon May 14 2007 kwizart < kwizart at gmail.com > - 0.22.0-4
- Add post & postun for update-desktop-database
- Add patch to prevent ld skipping incompatible on lib64
- Rebuild with new fltk prevent some rpath problems
- Pre test oyranos-devel ftgl-devel
* Sat May 12 2007 kwizart < kwizart at gmail.com > - 0.22.0-3.1
- Add python_sitearch (needed on x86_64)
- Add Requires freefont (FreeSans.ttf needed for icc_examin)
- Remove rpath (libtool method)
- Add BR oyranos-devel
* Fri May 11 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.22.0-3
- Don't use rpath
- Don't call autoconf
- Add missing / Remove unnecessary BuildRequires/Requires
- Fix file entry (especially for directory ownership issue)
- Fix desktop file
- Resolve undefined non-weak symbol
* Thu May 10 2007 kwizart < kwizart at gmail.com > - 0.22.0-2
- Add autoconf
- Add libXpm-devel
- Add ftgl-devel (optional - wip)
- Add xorg-x11-proto-devel (icc_examin)
* Wed Apr 11 2007 kwizart < kwizart at gmail.com > - 0.22.0-1
- Update to 0.22-0
- Add --enable-gtk2
- Enable python
* Mon Jan 29 2007 kwizart < kwizart at gmail.com > - 0.21.2-1
- Initial release for Fedora Extras
* Mon May 29 2006 Kai-Uwe Behrmann
- move desktop entries to normal installation
* Mon Mar 26 2006 Kai-Uwe Behrmann
- add locale info
* Fri Apr 11 2003 Robin Rowe
- filmgimp to cinepaint rename
- rename gimp files
* Tue Dec 03 2002 Sam Richards
- Changed include directory path.
* Wed Nov 06 2002 Rene Rask
- release 0.6-2
- Rpms can now be built from source by running "make rpm"
- Updated splash and logo images.
* Mon Nov 04 2002 Rene Rask
- release 0.6.
* Wed Oct 30 2002 Rene Rask
- Initial RPM release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cinepaint/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Jul 2007 23:02:22 -0000 1.1
+++ .cvsignore 13 Jul 2007 10:17:09 -0000 1.2
@@ -0,0 +1 @@
+cinepaint-0.22-1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cinepaint/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Jul 2007 23:02:22 -0000 1.1
+++ sources 13 Jul 2007 10:17:09 -0000 1.2
@@ -0,0 +1 @@
+f360587240db6b6d2f0bfd94c420c492 cinepaint-0.22-1.tar.gz
More information about the fedora-extras-commits
mailing list