rpms/qscintilla/devel qscintilla-1.61-gpl-1.4-designer-incpath.patch, NONE, 1.1 qscintilla.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Konstantin Ryabitsev (icon)]

Author: icon

Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29413/devel

Modified Files:
	.cvsignore sources 
Added Files:
	qscintilla-1.61-gpl-1.4-designer-incpath.patch qscintilla.spec 
Log Message:
auto-import qscintilla-1.6-3.fc4 on branch devel from qscintilla-1.6-3.fc4.src.rpm

qscintilla-1.61-gpl-1.4-designer-incpath.patch:

--- NEW FILE qscintilla-1.61-gpl-1.4-designer-incpath.patch ---
--- qscintilla-1.61-gpl-1.4/designer/designer.pro.designer-incpath	2004-09-16 15:09:24.000000000 -0500
+++ qscintilla-1.61-gpl-1.4/designer/designer.pro	2004-09-16 15:08:31.000000000 -0500
@@ -9,4 +9,6 @@
 
 SOURCES += qscintillaplugin.cpp
 
-LIBS += -lqscintilla
+LIBS += -L$(DESTDIR)../../lib -lqscintilla
+
+INCPATH = $(DESTDIR)../../include ../qt


--- NEW FILE qscintilla.spec ---
%define         scintilla_ver   1.65
%define         qtdir           %{_libdir}/qt-3.3

Name:	        qscintilla 
Version:        1.6
Release:        3%{?dist}
Summary:        A Scintilla port to Qt

License:        GPL
Group:          Development/Tools
Url:            http://www.riverbankcomputing.co.uk/qscintilla/
Source:         http://www.river-bank.demon.co.uk/download/QScintilla/qscintilla-%{scintilla_ver}-gpl-%{version}.tar.gz
Patch1:         qscintilla-1.61-gpl-1.4-designer-incpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  qt-devel >= 1:3.3, qt-devel < 1:3.4

%description
QScintilla is a port or Scintilla to the Qt GUI toolkit from Trolltech 
and runs on any operating system supported by Qt (eg. Windows, UNIX/Linux, 
MacOS/X).  Qt v3 or later is required.

This version of QScintilla is based on Scintilla v%{scintilla_ver}.


%package designer
Summary:        QScintilla designer plugin 
Group:          Development/Tools
Requires:       %{name} = %{version}-%{release}
Requires:       qt-designer >= 1:3.3, qt-designer < 1:3.4

%description designer
QScintillla designer plugin.


%package devel
Summary:        QScintilla Development Files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       qt-devel >= 1:3.3, qt-devel < 1:3.4

%description devel
These are the development files for QScintilla, needed to build against
QScintilla.


%prep
%setup -q -n %{name}-%{scintilla_ver}-gpl-%{version}
%patch1 -p1 -b .designer-incpath
# fixups to support RPM_BUILD_ROOT/DESTDIR
sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
# fix permissions on doc files
find doc example -type f -exec chmod 0644 {} ';'


%build
pushd qt
qmake qscintilla
echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
make %{?_smp_mflags} build
popd

pushd designer
qmake designer
echo 'build: $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)' >> Makefile
make %{?_smp_mflags} build
popd


%install
rm -rf $RPM_BUILD_ROOT
pushd qt
make install INSTALL_ROOT=$RPM_BUILD_ROOT
popd
pushd designer
make INSTALL_ROOT=$RPM_BUILD_ROOT
popd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE NEWS README
%{qtdir}/lib/*.so.*
%{qtdir}/translations/*


%files designer
%defattr(-,root,root,-)
%{qtdir}/plugins/designer/*


%files devel
%defattr(-,root,root,-)
%doc doc/html doc/Scintilla example
%{qtdir}/lib/*.so
%{qtdir}/include/*


%changelog
* Wed Sep 14 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.6-3
- Fix permissions in prep, not in install.

* Tue Sep 13 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 1.6-2
- Fix permissions on doc files to be 0644.

* Sun Sep 11 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 1.6-1
- Update to 1.65-gpl-1.6
- Use the patch from Aurelien Bompard to build sanely in buildroot
- Include docs and examples for the -devel package

* Sat Aug 27 2005 Konstantin Ryabitsev <icon at linux.duke.edu> 1.5.1-1
- Adapt for Fedora Extras
- Drop 0-Epoch
- Make specfile simpler
- Move .so to devel

* Mon Mar 09 2005 Rex Dieter 0:1.5.1-0.0.kde
- 1.5.1

* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.4-0.1.kde
- updated designer-incpath patch: don't require an already installed
  qscintilla-devel
- BuildConflicts: qscintilla-devel != %%version

* Thu Sep 16 2004 Rex Dieter <rexdieter at sf.net> 0:1.4-0.0.kde
- 1.4
- include designer plugin
- Prereq: %%qtdir

* Fri May 28 2004 Rex Dieter <rexdieter at sf.net> 0:1.3-0.fdr.0
- 1.3

* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.6
- dynamically determine version for qt dependancy.

* Wed Mar 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.5
- (re)build against qt-3.3.1

* Wed Dec 03 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.4
- remove extraneous macros
- (re)build against qt-3.2.3

* Mon Nov 10 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.3
- (re)build against qt-3.2.2

* Wed Sep 17 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.2
- use Epoch's in Requires

* Tue Aug 19 2003 Rex Dieter <rexdieter at sf.net> 0:1.2-0.fdr.1
- 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Sep 2005 15:09:29 -0000	1.1
+++ .cvsignore	15 Sep 2005 15:10:44 -0000	1.2
@@ -0,0 +1 @@
+qscintilla-1.65-gpl-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Sep 2005 15:09:29 -0000	1.1
+++ sources	15 Sep 2005 15:10:44 -0000	1.2
@@ -0,0 +1 @@
+8dbebef07cd2c934fbec3ee1bdfecfa3  qscintilla-1.65-gpl-1.6.tar.gz