rpms/scribus/F-12 scribus-1.3.6-linker.patch, NONE, 1.1 scribus-1.3.6-qstring.patch, NONE, 1.1 scribus-1.3.6-version.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 scribus.spec, 1.53, 1.54 sources, 1.22, 1.23 scribus-1.3.5-check-hdict.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/scribus/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17650

Modified Files:
	.cvsignore scribus.spec sources 
Added Files:
	scribus-1.3.6-linker.patch scribus-1.3.6-qstring.patch 
	scribus-1.3.6-version.patch 
Removed Files:
	scribus-1.3.5-check-hdict.patch 
Log Message:
* Wed Mar 31 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-2
- added 2 patches for rawhide


scribus-1.3.6-linker.patch:
 CMakeLists.txt |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE scribus-1.3.6-linker.patch ---
diff -up scribus-1.3.6/scribus/CMakeLists.txt.linker scribus-1.3.6/scribus/CMakeLists.txt
--- scribus-1.3.6/scribus/CMakeLists.txt.linker	2010-03-31 11:52:41.000000000 +0200
+++ scribus-1.3.6/scribus/CMakeLists.txt	2010-03-31 11:56:16.000000000 +0200
@@ -761,6 +761,11 @@ TARGET_LINK_LIBRARIES(${EXE_NAME}
   ${WIN32_ONLY_LIBS}
 )
 
+# required to resolve symbols from libdl when ld is called with --no-add-needed
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
+ENDIF(UNIX)
+
 IF(WIN32)
   TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
 ENDIF(WIN32)

scribus-1.3.6-qstring.patch:
 plugins/barcodegenerator/barcodegenerator.h |    2 +-
 scribusdoc.cpp                              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE scribus-1.3.6-qstring.patch ---
diff -up scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h.qstring scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h
--- scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h.qstring	2010-03-30 15:38:04.000000000 +0200
+++ scribus-1.3.6/scribus/plugins/barcodegenerator/barcodegenerator.h	2010-03-30 15:39:46.000000000 +0200
@@ -100,7 +100,7 @@ class BarcodeGenerator : public QDialog
 		\param dpi optional DPI value. Default is 72 for preview.
 		\retval bool true on success.
 		*/
-		bool paintBarcode(QString fileName = 0, int dpi = 72);
+		bool paintBarcode(QString fileName = QString::null, int dpi = 72);
 		/*! \brief Create color preview.
 		Used for Color box feedback.
 		\param l A pointer to the sample QLabel
diff -up scribus-1.3.6/scribus/scribusdoc.cpp.qstring scribus-1.3.6/scribus/scribusdoc.cpp
--- scribus-1.3.6/scribus/scribusdoc.cpp.qstring	2010-03-31 11:41:08.000000000 +0200
+++ scribus-1.3.6/scribus/scribusdoc.cpp	2010-03-31 11:40:45.000000000 +0200
@@ -189,7 +189,7 @@ ScribusDoc::ScribusDoc() : UndoObject( t
 	pageSets(prefsData.pageSets),
 	PageSp(1), PageSpa(0),
 	currentPageLayout(0),
-	PageOri(0), m_pageSize(0),
+	PageOri(0), m_pageSize(QString::null),
 	FirstPnum(1),
 	useRaster(false),
 	PageColors(this, true),

scribus-1.3.6-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE scribus-1.3.6-version.patch ---
diff -up scribus-1.3.6/CMakeLists.txt.version scribus-1.3.6/CMakeLists.txt
--- scribus-1.3.6/CMakeLists.txt.version	2010-03-30 11:54:53.000000000 +0200
+++ scribus-1.3.6/CMakeLists.txt	2010-03-30 11:55:15.000000000 +0200
@@ -79,7 +79,7 @@ SET (VERSION_MAJOR "1")
 SET (VERSION_MINOR "3")
 SET (VERSION_PATCH "6")
 SET (VERSION_SUFFIX "")
-SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUFFIX})
+SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
 MESSAGE(STATUS "Scribus ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
 
 #Set the permissions to be used when installing plugins


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	20 Aug 2009 10:55:37 -0000	1.22
+++ .cvsignore	31 Mar 2010 10:43:04 -0000	1.23
@@ -1 +1 @@
-scribus-1.3.5.1.tar.bz2
+scribus-1.3.6.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-12/scribus.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- scribus.spec	26 Nov 2009 07:39:15 -0000	1.53
+++ scribus.spec	31 Mar 2010 10:43:04 -0000	1.54
@@ -1,6 +1,6 @@
 Name:           scribus
-Version:        1.3.5.1
-Release:        5%{?dist}
+Version:        1.3.6
+Release:        2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -11,9 +11,12 @@ Source0:        http://downloads.sourcef
 # https://bugzilla.redhat.com/show_bug.cgi?id=506074
 # http://bugs.scribus.net/view.php?id=8232
 Patch0:         %{name}-1.3.5-system-hyphen.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=537677
-# http://bugs.scribus.net/view.php?id=8595
-Patch1:         %{name}-1.3.5-check-hdict.patch
+# fix version variable for buildsystem
+Patch1:         %{name}-1.3.6-version.patch
+# fix QString initialization in Qt 4.7
+Patch2:         %{name}-1.3.6-qstring.patch
+# fix linking with --no-add-needed
+Patch3:         %{name}-1.3.6-linker.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -81,7 +84,9 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .system-hyphen
-%patch1 -p2 -b .check-hdict
+%patch1 -p1 -b .version
+%patch2 -p1 -b .qstring
+%patch3 -p1 -b .linker
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -189,6 +194,12 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Wed Mar 31 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-2
+- added 2 patches for rawhide
+
+* Mon Mar 29 2010 Dan Horák <dan[AT]danny.cz> - 1.3.6-1
+- update to final 1.3.6
+
 * Wed Nov 25 2009 Dan Horák <dan[AT]danny.cz> - 1.3.5.1-5
 - fixed a crash when closing a hyphenator object (#537677)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scribus/F-12/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	20 Aug 2009 10:55:38 -0000	1.22
+++ sources	31 Mar 2010 10:43:04 -0000	1.23
@@ -1 +1 @@
-4cadca0c780491ad61dc2d815776f10b  scribus-1.3.5.1.tar.bz2
+2d653c8371d198b5d8321e9ba5e0142d  scribus-1.3.6.tar.bz2


--- scribus-1.3.5-check-hdict.patch DELETED ---