diff options
| -rw-r--r-- | redhat/applications/settings/tde-guidance/tde-guidance.spec | 8 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 2 | ||||
| -rw-r--r-- | redhat/dependencies/pytqt/pytqt.spec (renamed from redhat/dependencies/python-tqt/python-tqt.spec) | 54 | ||||
| -rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions.spec | 4 |
4 files changed, 39 insertions, 29 deletions
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec index 202b88003..344c9c432 100644 --- a/redhat/applications/settings/tde-guidance/tde-guidance.spec +++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec @@ -88,7 +88,7 @@ BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 # PYTHON-QT support -BuildRequires: python-tqt-devel +BuildRequires: pytqt-devel BuildRequires: trinity-python-trinity-devel BuildRequires: trinity-pytqt-tools @@ -154,7 +154,7 @@ BuildRequires: xscreensaver-gl BuildRequires: %{python} BuildRequires: %{python}-devel -Requires: python-tqt +Requires: pytqt Requires: trinity-python-trinity Requires: trinity-pytdeextensions %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} @@ -305,7 +305,7 @@ suspend using HAL. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -#export PYTHONPATH=%{python_sitearch}/python-tqt +#export PYTHONPATH=%{python_sitearch}/pytqt # Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia export PYTHONDONTWRITEBYTECODE= @@ -327,7 +327,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" export SIPTQT_DIR="%{python_sitearch}/sip4_tqt" -export PYTHONPATH="%{python_sitearch}/python-tqt" +export PYTHONPATH="%{python_sitearch}/pytqt" # Support for 'sip4-tqt' export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index ac821c4af..ea121d4a1 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -20,7 +20,7 @@ case "${PKGNAME}" in # In case prefix is already there, don't add it again. "trinity-"*) PREFIX="";; # Most TDE dependencies have no prefix - "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; + "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"polkit-tqt"|"pytqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; # 3rd party dependencies "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"pinentry-tqt"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/pytqt/pytqt.spec index be24592b2..ccf826308 100644 --- a/redhat/dependencies/python-tqt/python-tqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -1,5 +1,5 @@ # -# spec file for package python-tqt (version R14) +# spec file for package pytqt (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -24,7 +24,7 @@ %if "%{?tde_version}" == "" %define tde_version 14.1.0 %endif -%define tde_pkg python-tqt +%define tde_pkg pytqt %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -61,6 +61,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Obsoletes: trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: tqt3-apps-devel >= 3.5.0 BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 @@ -118,30 +120,32 @@ BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel Python binding module that allows use of TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts. -At this moment python-tqt offers a vast subset of TQt API. There are +At this moment pytqt offers a vast subset of TQt API. There are some minor issues related to the differences between C++ and Python (types, etc), but usually you'll be able to write code pretty much the same way in both languages (with syntax differences, of course) ########## -%package -n python-tqt +%package -n pytqt Summary: TQt bindings for Python Group: Development/Libraries/Python Requires: trinity-filesystem >= %{tde_version} Requires: sip4-tqt >= %{?epoch:%{epoch}:}4.10.5 Requires: libtqt4 >= %{?epoch:%{epoch}:}4.2.0 +Obsoletes: python-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt +%description -n pytqt Python binding module that allows use of TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts. -At this moment python-tqt offers a vast subset of TQt API. There are +At this moment pytqt offers a vast subset of TQt API. There are some minor issues related to the differences between C++ and Python (types, etc), but usually you'll be able to write code pretty much the same way in both languages (with syntax differences, of course) -%files -n python-tqt +%files -n pytqt %defattr(-,root,root,-) %doc NEWS README %dir %{python_sitearch}/python_tqt @@ -156,34 +160,38 @@ same way in both languages (with syntax differences, of course) ########## -%package -n python-tqt-gl +%package -n pytqt-gl Summary: TQt OpenGL bindings for Python Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: python-tqt-gl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt-gl = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt-gl +%description -n pytqt-gl Python binding module that allows use of the OpenGL facilities offered by the TQt X Window toolkit v3. You can use it to create portable graphics-capable scripts. -%files -n python-tqt-gl +%files -n pytqt-gl %defattr(-,root,root,-) %{python_sitearch}/python_tqt/qtgl.so ########## -%package -n python-tqt-tqtext -Summary: TQtext extensions for python-tqt +%package -n pytqt-tqtext +Summary: TQtext extensions for pytqt Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: python-tqt-tqtext < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt-tqtext = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt-tqtext -python-tqt Extensions. Contains: +%description -n pytqt-tqtext +pytqt Extensions. Contains: * TQScintilla: a featureful TQt source code editing component based on Scintilla. -%files -n python-tqt-tqtext +%files -n pytqt-tqtext %defattr(-,root,root,-) %{python_sitearch}/python_tqt/qtext.so @@ -192,7 +200,7 @@ python-tqt Extensions. Contains: %package -n trinity-pytqt-tools Summary: Pyuic and pylupdate for TQt Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-pytqt-tools pyuic is the PyQt counterpart for TQt's uic. It takes an XML @@ -208,19 +216,21 @@ Linguist translation files from Python code. ########## -%package -n python-tqt-devel +%package -n pytqt-devel Summary: TQt bindings for Python - Development files Group: Development/Libraries/Python -Requires: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 +Obsoletes: python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n python-tqt-devel +%description -n pytqt-devel Development .sip files with definitions of PyQt classes. They are needed to build PyQt, but also as building blocks of other packages based on them, like PyTDE. -%files -n python-tqt-devel +%files -n pytqt-devel %defattr(-,root,root,-) %{python_sitearch}/python_tqt/pyqtconfig.py* %dir %{_datadir}/sip diff --git a/redhat/libraries/pytdeextensions/pytdeextensions.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 000f79b48..76f205659 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -62,10 +62,10 @@ BuildRequires: gettext BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ -BuildRequires: python-tqt-devel >= %{?epoch:%{epoch}:}3.18.1 +BuildRequires: pytqt-devel >= %{?epoch:%{epoch}:}3.18.1 BuildRequires: trinity-python-trinity-devel BuildRequires: trinity-pytqt-tools -Requires: python-tqt +Requires: pytqt Requires: trinity-python-trinity Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} |