rpms/cinepaint/devel icc_examin-0.46-dso.patch, NONE, 1.1 cinepaint.spec, 1.24, 1.25

Dan Horák sharkcz at fedoraproject.org
Wed Jun 23 12:12:42 UTC 2010


Author: sharkcz

Update of /cvs/pkgs/rpms/cinepaint/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9225

Modified Files:
	cinepaint.spec 
Added Files:
	icc_examin-0.46-dso.patch 
Log Message:
* Wed Jun 23 2010 Dan Horák <dan[at]danny.cz> - 0.22.1-16
- fix linking on i386


icc_examin-0.46-dso.patch:
 makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE icc_examin-0.46-dso.patch ---
diff -up icc_examin-0.46/makefile.in.dso icc_examin-0.46/makefile.in
--- icc_examin-0.46/makefile.in.dso	2010-06-23 13:56:26.000000000 +0200
+++ icc_examin-0.46/makefile.in	2010-06-23 13:56:38.000000000 +0200
@@ -37,7 +37,7 @@ ALL_INCL = $(INCL) \
 CFLAGS_ = $(CFLAGS) $(DEBUG) $(ALL_INCL)
 CXXFLAGS_ = $(CXXFLAGS) $(DEBUG) $(ALL_INCL)
 
-LDLIBS = $(LDFLAGS) -L$(libdir) -L./ $(LIBFL_I18N) $(FLTK_LIBS) \
+LDLIBS = $(LDFLAGS) -lpthread -L$(libdir) -L./ $(LIBFL_I18N) $(FLTK_LIBS) \
 	$(Flmm_OBJECTS) $(X11_LIBS) -llcms -L/lib \
 	$(LIBOYRANOS_EXTRA) $(OYRANOS_LIBS) $(LCMS_LIBS) \
 	$(FTGL_LIBS) $(I18N_LIB) $(DBG_LIBS) $(LIBNAME) $(LIBBSP) $(CWLIB)


Index: cinepaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- cinepaint.spec	23 Jun 2010 10:49:29 -0000	1.24
+++ cinepaint.spec	23 Jun 2010 12:12:42 -0000	1.25
@@ -6,7 +6,7 @@
 
 Name:           cinepaint
 Version:        %(echo %{cinever} |sed 's|-|.|')
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        CinePaint is a tool for manipulating images
 
 Group:          Applications/Multimedia
@@ -28,6 +28,7 @@ Patch11:        icc_examin-0.46-default.
 Patch12:        cinepaint-0.22-oyranos19.patch
 Patch13:        cinepaint-0.22-1-dso.patch
 Patch14:        icc_examin-0.46-overflow.patch
+Patch15:        icc_examin-0.46-dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #ifnarch %{ix86} ppc
@@ -111,6 +112,7 @@ touch -r cinepaint.m4.underquoted cinepa
 pushd icc_examin-0.46
 %patch11 -p1 -b .icc_def
 %patch14 -p1 -b .overflow
+%patch15 -p1 -b .dso
 popd
 
 %patch12 -p1 -b .oy19
@@ -223,6 +225,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Wed Jun 23 2010 Dan Horák <dan[at]danny.cz> - 0.22.1-16
+- fix linking on i386
+
 * Wed Jun 23 2010 Dan Horák <dan[at]danny.cz> - 0.22.1-15
 - fix FTBFS #565039
 - fix string overflow in icc_examin.cpp (#523700 ??)



More information about the scm-commits mailing list