diff options
| -rw-r--r-- | redhat/applications/settings/tde-guidance/tde-guidance.spec | 6 | ||||
| -rw-r--r-- | redhat/libraries/pytde/pytde.spec (renamed from redhat/libraries/python-trinity/python-trinity.spec) | 18 | ||||
| -rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions.spec | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 344c9c432..b4193b7e0 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -65,7 +65,7 @@ BuildRequires: desktop-file-utils BuildRequires: trinity-pytdeextensions BuildRequires: trinity-libpythonize0-devel -BuildRequires: trinity-python-trinity +BuildRequires: trinity-pytde BuildRequires: chrpath BuildRequires: autoconf automake libtool m4 @@ -89,7 +89,7 @@ Requires: sip4-tqt >= 4.10.5 # PYTHON-QT support BuildRequires: pytqt-devel -BuildRequires: trinity-python-trinity-devel +BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools # LIBXXF86VM support @@ -155,7 +155,7 @@ BuildRequires: %{python} BuildRequires: %{python}-devel Requires: pytqt -Requires: trinity-python-trinity +Requires: trinity-pytde Requires: trinity-pytdeextensions %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/pytde/pytde.spec index cde093dd8..03a1cbdd6 100644 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ b/redhat/libraries/pytde/pytde.spec @@ -1,5 +1,5 @@ # -# spec file for package python-trinity (version R14) +# spec file for package pytde (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -20,7 +20,7 @@ %if "%{?tde_version}" == "" %define tde_version 14.1.0 %endif -%define tde_pkg python-trinity +%define tde_pkg pytde %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -74,8 +74,8 @@ BuildRequires: gcc-c++ BuildRequires: %{python} BuildRequires: %{python}-devel -BuildRequires: python-tqt-devel -Requires: python-tqt +BuildRequires: pytqt-devel +Requires: pytqt # SIP BuildRequires: sip4-tqt-devel >= 4.10.5 @@ -83,6 +83,8 @@ Requires: sip4-tqt >= 4.10.5 Obsoletes: python-trinity < %{?epoch:%{epoch}:}%{version}-%{release} Provides: python-trinity = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-trinity < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-trinity = %{?epoch:%{epoch}:}%{version}-%{release} %description Python binding module that provides wide access to the Trinity API, @@ -105,6 +107,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development .sip files with definitions of PyTDE classes. They @@ -127,6 +131,8 @@ Group: Development/Libraries/Python Obsoletes: python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release} Provides: python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-trinity-doc < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-trinity-doc = %{?epoch:%{epoch}:}%{version}-%{release} %description doc General documentation and examples for PyTDE providing programming @@ -134,7 +140,7 @@ tips and working code you can use to learn from. %files doc %defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/en/python-trinity/ +%{tde_tdedocdir}/HTML/en/pytde/ ########## @@ -174,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}" # Install documentation %__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/ -%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/ +%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/pytde/ %clean diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 76f205659..bdf7bbe53 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -63,10 +63,10 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ BuildRequires: pytqt-devel >= %{?epoch:%{epoch}:}3.18.1 -BuildRequires: trinity-python-trinity-devel +BuildRequires: trinity-pytde-devel BuildRequires: trinity-pytqt-tools Requires: pytqt -Requires: trinity-python-trinity +Requires: trinity-pytde Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} |