packages: qscintilla/qscintilla.spec - ghost soname symlink - qscintilla ha...

[qboosh]

Author: qboosh                       Date: Thu Jun 23 09:56:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ghost soname symlink
- qscintilla has internal scintilla sources, dropped scintilla-devel BR
- dropped idea of renaming to qscintilla1: it provides libqscintilla while qscintilla2 provides libqscintilla2
- general cleanup
- release 2

---- Files affected:
packages/qscintilla:
   qscintilla.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/qscintilla/qscintilla.spec
diff -u packages/qscintilla/qscintilla.spec:1.23 packages/qscintilla/qscintilla.spec:1.24
--- packages/qscintilla/qscintilla.spec:1.23	Tue Feb 13 09:06:43 2007
+++ packages/qscintilla/qscintilla.spec	Thu Jun 23 11:55:55 2011
@@ -1,11 +1,10 @@
 # $Revision$, $Date$
-# TODO: Consider renaming to QScintilla1 ?
 %define	scintilla_ver	1.71
 Summary:	QScintilla - a port of Neil Hodgson's Scintilla C++ editor class to Qt
 Summary(pl.UTF-8):	QScintilla - port do Qt klas C++ edytora Scintilla autorstwa Neila Hodgsona
 Name:		qscintilla
 Version:	1.7.1
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2
 Group:		X11/Libraries
@@ -13,12 +12,12 @@
 # Source0-md5:	dfa047b45d4f09ae8d4a8a431ba88a5a
 URL:		http://www.riverbankcomputing.co.uk/qscintilla/index.php
 BuildRequires:	qmake
-BuildRequires:	qt-devel
-BuildRequires:	scintilla-devel >= %{scintilla_ver}
+BuildRequires:	qt-devel >= 3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class.
+QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
+class.
 
 %description -l pl.UTF-8
 QScintilla jest portem do Qt klas C++ edytora Scintilla autorstwa
@@ -29,7 +28,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe dla QScintilla
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	qt-devel
+Requires:	qt-devel >= 3.0
 
 %description devel
 This package contains the header files necessary to develop
@@ -46,25 +45,27 @@
 QTDIR=%{_prefix}
 export QTDIR
 cd qt
-qmake -o Makefile -after DESTDIR=tmp qscintilla.pro
-#Potrzebna latka usuwajaca/przenoszaca z Makefile -  all: to co powinno znalezc sie w install:
+# change DESTDIR - original .pro tries to build directly to QTDIR
+qmake -o Makefile -after DESTDIR=out qscintilla.pro \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/qt \
-	$RPM_BUILD_ROOT%{_examplesdir}/qt/%{name} \
-	$RPM_BUILD_ROOT%{_libdir}/qt \
-	$RPM_BUILD_ROOT%{_datadir}/locale/{de,fr,pt_BR,ru}/LC_MESSAGES
+	$RPM_BUILD_ROOT%{_libdir}
 
-cp -df qt/tmp/libqscintilla.so* $RPM_BUILD_ROOT%{_libdir}
+cp -df qt/out/libqscintilla{.so,.so.?,.so.*.*.*} $RPM_BUILD_ROOT%{_libdir}
 install qt/qextscintilla*.h $RPM_BUILD_ROOT%{_includedir}/qt
 
 # where should it be placed to be used?
 # README says $QTDIR/translations, but it doesn't exist
-install qt/qscintilla_de.qm $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/qscintilla.qm
-install qt/qscintilla_fr.qm $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/qscintilla.qm
-install qt/qscintilla_ru.qm $RPM_BUILD_ROOT%{_datadir}/locale/ru/LC_MESSAGES/qscintilla.qm
+install -Dp qt/qscintilla_de.qm $RPM_BUILD_ROOT%{_datadir}/locale/de/LC_MESSAGES/qscintilla.qm
+install -Dp qt/qscintilla_fr.qm $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/qscintilla.qm
+install -Dp qt/qscintilla_pt_br.qm $RPM_BUILD_ROOT%{_datadir}/locale/pt_BR/LC_MESSAGES/qscintilla.qm
+install -Dp qt/qscintilla_ru.qm $RPM_BUILD_ROOT%{_datadir}/locale/ru/LC_MESSAGES/qscintilla.qm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,15 +77,17 @@
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libqscintilla.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqscintilla.so.7
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qscintilla.qm
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qscintilla.qm
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/qscintilla.qm
 %lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/qscintilla.qm
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/*
+%doc doc/{Scintilla,html}
 %attr(755,root,root) %{_libdir}/libqscintilla.so
-%{_includedir}/qt/*.h
+%{_includedir}/qt/qextscintilla*.h
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -92,6 +95,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/06/23 09:55:55  qboosh
+- ghost soname symlink
+- qscintilla has internal scintilla sources, dropped scintilla-devel BR
+- dropped idea of renaming to qscintilla1: it provides libqscintilla while qscintilla2 provides libqscintilla2
+- general cleanup
+- release 2
+
 Revision 1.23  2007/02/13 08:06:43  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qscintilla/qscintilla.spec?r1=1.23&r2=1.24&f=u