Attachment 7192 Details for Bug 17039 – qscintilla.spec.diff

[patch] qscintilla.spec.diff

qscintilla.spec.diff (text/plain), 1.96 KB, created by David GEIGER on 2015-11-10 09:35:23 CET

(hide)

Description:

Filename:

MIME Type:

Creator: David GEIGER

Created: 2015-11-10 09:35:23 CET

Size: 1.96 KB

patch

obsolete

>Index: qscintilla.spec
>===================================================================
>--- qscintilla.spec	(rÃ©vision 900750)
>+++ qscintilla.spec	(copie de travail)
>@@ -6,7 +6,7 @@
> 
> Name:           qscintilla
> Version:        2.9.1
>-Release:        %mkrel 4
>+Release:        %mkrel 5
> Summary:        Port to Qt of Neil Hodgson's Scintilla C++ editor class
> License:        GPLv2+
> Group:          System/Libraries
>@@ -57,6 +57,7 @@
> Group:          System/Libraries
> # Mageia 5
> Conflicts:      qscintilla-i18n < 2.8.1-2
>+Obsoletes:      qscintilla-i18n-qt4 < 2.9.1-2
> 
> %description -n %{libqs4}
> As well as features found in standard text editing components,
>@@ -80,6 +81,7 @@
> Group:          System/Libraries
> # Cauldron (mga6)
> Conflicts:      qscintilla-i18n < 2.9.1-2
>+Obsoletes:      qscintilla-i18n < 2.9.1-2
> 
> %description -n %{libqs5}
> As well as features found in standard text editing components,
>@@ -104,6 +106,8 @@
> Requires:       %{libqs5} = %{version}-%{release}
> Provides:       %{name}-qt5-devel = %{version}-%{release}
> 
>+Obsoletes:      %{_lib}qscintilla-devel < 2.9.1-2
>+
> %description -n %{libqs5dev}
> This packages contains the libraries, include and other files
> you can use to develop applications with QScintilla.
>@@ -123,6 +127,8 @@
> Provides:       %{name}-qt4-devel = %{version}-%{release}
> Provides:       %{name}-devel = %{version}-%{release}
> 
>+Obsoletes:      %{_lib}qscintilla-qt4-devel < 2.9.1-2
>+
> %description -n %{libqs4dev}
> This packages contains the libraries, include and other files
> you can use to develop applications with QScintilla.
>@@ -190,6 +196,8 @@
> Requires:       sip-api(%{_sip_api_major}) >= %{_sip_api}
> Requires:       %{libqs4} = %{version}
> 
>+Obsoletes:      python2-qt4-qscintilla < 2.9.1-2
>+
> %description -n python-qt4-qscintilla
> Python2 Qt4 QScintilla bindings.
> 
>@@ -218,6 +226,8 @@
> Group:          Development/KDE and Qt
> BuildArch:      noarch
> 
>+Obsoletes:      qscintilla-doc-qt4 < 2.9.1-2
>+
> %description    doc
> QScintilla doc.
>

Index: qscintilla.spec
===================================================================
--- qscintilla.spec	(rÃ©vision 900750)
+++ qscintilla.spec	(copie de travail)
@@ -6,7 +6,7 @@
 
 Name:           qscintilla
 Version:        2.9.1
-Release:        %mkrel 4
+Release:        %mkrel 5
 Summary:        Port to Qt of Neil Hodgson's Scintilla C++ editor class
 License:        GPLv2+
 Group:          System/Libraries
@@ -57,6 +57,7 @@
 Group:          System/Libraries
 # Mageia 5
 Conflicts:      qscintilla-i18n < 2.8.1-2
+Obsoletes:      qscintilla-i18n-qt4 < 2.9.1-2
 
 %description -n %{libqs4}
 As well as features found in standard text editing components,
@@ -80,6 +81,7 @@
 Group:          System/Libraries
 # Cauldron (mga6)
 Conflicts:      qscintilla-i18n < 2.9.1-2
+Obsoletes:      qscintilla-i18n < 2.9.1-2
 
 %description -n %{libqs5}
 As well as features found in standard text editing components,
@@ -104,6 +106,8 @@
 Requires:       %{libqs5} = %{version}-%{release}
 Provides:       %{name}-qt5-devel = %{version}-%{release}
 
+Obsoletes:      %{_lib}qscintilla-devel < 2.9.1-2
+
 %description -n %{libqs5dev}
 This packages contains the libraries, include and other files
 you can use to develop applications with QScintilla.
@@ -123,6 +127,8 @@
 Provides:       %{name}-qt4-devel = %{version}-%{release}
 Provides:       %{name}-devel = %{version}-%{release}
 
+Obsoletes:      %{_lib}qscintilla-qt4-devel < 2.9.1-2
+
 %description -n %{libqs4dev}
 This packages contains the libraries, include and other files
 you can use to develop applications with QScintilla.
@@ -190,6 +196,8 @@
 Requires:       sip-api(%{_sip_api_major}) >= %{_sip_api}
 Requires:       %{libqs4} = %{version}
 
+Obsoletes:      python2-qt4-qscintilla < 2.9.1-2
+
 %description -n python-qt4-qscintilla
 Python2 Qt4 QScintilla bindings.
 
@@ -218,6 +226,8 @@
 Group:          Development/KDE and Qt
 BuildArch:      noarch
 
+Obsoletes:      qscintilla-doc-qt4 < 2.9.1-2
+
 %description    doc
 QScintilla doc.

Actions: View | Diff

Attachments on bug 17039: 7173 | 7174 | 7192