rpms/qscintilla/F-10 qscintilla.spec,1.21,1.22
Rex Dieter
rdieter at fedoraproject.org
Sun Aug 9 18:51:20 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/qscintilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17448
Modified Files:
qscintilla.spec
Log Message:
* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
- include designer plugin in main pkg, Obsoletes: qscintilla-designer
Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/qscintilla.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- qscintilla.spec 8 Aug 2009 21:00:13 -0000 1.21
+++ qscintilla.spec 9 Aug 2009 18:51:20 -0000 1.22
@@ -6,7 +6,7 @@
Name: qscintilla
Version: 2.4
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: A Scintilla port to Qt
# matches up (pretty much) with qt4
License: GPLv3 or GPLv2 with exceptions
@@ -18,6 +18,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version
# TODO: upstream this
Patch1: QScintilla-2-gpl-Qt4-incpath.patch
+Obsoletes: qscintilla-designer < 2.4-3
+Provides: qscintilla-designer = %{version}-%{release}
+
BuildRequires: qt4-devel
# for -python
@@ -34,15 +37,6 @@ QScintilla is a port of Scintilla to the
%{?scintilla_ver: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: qt4-designer
-%description designer
-%{summary}.
-
%package devel
Summary: QScintilla Development Files
Group: Development/Libraries
@@ -131,13 +125,10 @@ rm -rf %{buildroot}
%doc LICENSE.GPL3
%doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
%{_qt4_libdir}/libqscintilla2.so.5*
+%{_qt4_plugindir}/designer/libqscintillaplugin.so
%{_qt4_translationdir}/*
%{_qt4_prefix}/qsci/
-%files designer
-%defattr(-,root,root,-)
-%{_qt4_plugindir}/designer/libqscintillaplugin.so
-
%files devel
%defattr(-,root,root,-)
%doc doc/html-Qt4 doc/Scintilla example-Qt4
@@ -156,6 +147,12 @@ rm -rf %{buildroot}
%changelog
+* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
+- include designer plugin in main pkg, Obsoletes: qscintilla-designer
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
- QScintilla-gpl-2.4
More information about the scm-commits
mailing list