| bec23ad3 | 2014-10-02 11:30:36 | François Andriot |
RPM Packaging: update dbus-tqt |
||
|
M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec M redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec |
||
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index a8692ce..69ead7b 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -18,6 +18,12 @@
# TDE specific building variables
%define tde_version 14.0.0
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
Name: trinity-dbus-1-tqt
Epoch: 2
@@ -66,14 +72,15 @@
###########
-%package -n libdbus-1-tqt0
+%package -n %{libdbus}-1-tqt0
Summary: dbus bindings for the Trinity Qt [TQt] interface
Group: System/Libraries
+Provides: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-1-tqt0
+%description -n %{libdbus}-1-tqt0
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -82,28 +89,29 @@
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-1-tqt0
+%post -n %{libdbus}-1-tqt0
/sbin/ldconfig || :
-%postun -n libdbus-1-tqt0
+%postun -n %{libdbus}-1-tqt0
/sbin/ldconfig || :
-%files -n libdbus-1-tqt0
+%files -n %{libdbus}-1-tqt0
%defattr(-,root,root,-)
%{_libdir}/libdbus-1-tqt.so.0
%{_libdir}/libdbus-1-tqt.so.0.0.0
##########
-%package -n libdbus-1-tqt0-devel
+%package -n %{libdbus}-1-tqt0-devel
Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files)
Group: Development/Libraries/C and C++
-Requires: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libdbus-1-tqt0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-1-tqt0-devel
+%description -n %{libdbus}-1-tqt0-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -112,13 +120,13 @@
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-1-tqt0-devel
+%post -n %{libdbus}-1-tqt0-devel
/sbin/ldconfig || :
-%postun -n libdbus-1-tqt0-devel
+%postun -n %{libdbus}-1-tqt0-devel
/sbin/ldconfig || :
-%files -n libdbus-1-tqt0-devel
+%files -n %{libdbus}-1-tqt0-devel
%defattr(-,root,root,-)
%{_bindir}/dbusxml2qt3
%{_includedir}/*.h
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index a3f7d26..89908b2 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -18,6 +18,12 @@
# TDE specific building variables
%define tde_version 14.0.0
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libdbus %{_lib}dbus
+%else
+%define libdbus libdbus
+%endif
+
Name: trinity-dbus-tqt
Epoch: 2
@@ -67,14 +73,15 @@
##########
-%package -n libdbus-tqt-1-0
-Summary: Simple inter-process messaging system (TQt-based shared library)
-Group: System/Libraries
+%package -n %{libdbus}-tqt-1-0
+Summary: Simple inter-process messaging system (TQt-based shared library)
+Group: System/Libraries
+Provides: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-tqt-1-0
+%description -n %{libdbus}-tqt-1-0
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -84,28 +91,29 @@
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-tqt-1-0
+%post -n %{libdbus}-tqt-1-0
/sbin/ldconfig || :
-%postun -n libdbus-tqt-1-0
+%postun -n %{libdbus}-tqt-1-0
/sbin/ldconfig || :
-%files -n libdbus-tqt-1-0
+%files -n %{libdbus}-tqt-1-0
%defattr(-,root,root,-)
%{_libdir}/libdbus-tqt-1.so.0
%{_libdir}/libdbus-tqt-1.so.0.0.0
##########
-%package -n libdbus-tqt-1-0-devel
+%package -n %{libdbus}-tqt-1-0-devel
Summary: Simple inter-process messaging system (TQt interface)
Group: Development/Libraries/C and C++
-Requires: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libdbus-tqt-1-0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n libdbus-tqt-1-0-devel
+%description -n %{libdbus}-tqt-1-0-devel
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
@@ -115,13 +123,13 @@
See the dbus description for more information about D-BUS in general.
-%post -n libdbus-tqt-1-0-devel
+%post -n %{libdbus}-tqt-1-0-devel
/sbin/ldconfig || :
-%postun -n libdbus-tqt-1-0-devel
+%postun -n %{libdbus}-tqt-1-0-devel
/sbin/ldconfig || :
-%files -n libdbus-tqt-1-0-devel
+%files -n %{libdbus}-tqt-1-0-devel
%defattr(-,root,root,-)
%{_includedir}/dbus-1.0/*
%{_libdir}/libdbus-tqt-1.so
|
||
| 5bd85082 | 2014-10-02 12:09:23 | François Andriot |
RPM Packaging: update libart_lgpl |
||
|
M redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec M redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec M redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec M redhat/dependencies/tqt3/tqt3-14.0.0.spec |
||
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 57e8c27..83dcd2e 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific building variables
+# TDE variables
%define tde_version 14.0.0
%define tde_prefix /opt/trinity
%define tde_includedir %{tde_prefix}/include
@@ -137,10 +137,10 @@
##########
-%package -n %{libavahi}-tqt1-devel
+%package -n %{libavahi}-tqt-devel
Summary: Avahi TQt integration library (Development Files)
Group: Development/Libraries/C and C++
-Provides: libavahi-tqt1-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt4-devel >= 1:4.2.0
@@ -156,7 +156,7 @@
Requires: avahi-devel
%endif
-%description -n %{libavahi}-tqt1-devel
+%description -n %{libavahi}-tqt-devel
Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
It allows programs to publish and discover services and hosts
running on a local network with no specific configuration. For
@@ -166,13 +166,13 @@
This library contains the interface to integrate the Avahi libraries
into a TQt main loop application.
-%post -n %{libavahi}-tqt1-devel
+%post -n %{libavahi}-tqt-devel
/sbin/ldconfig || :
-%postun -n %{libavahi}-tqt1-devel
+%postun -n %{libavahi}-tqt-devel
/sbin/ldconfig || :
-%files -n %{libavahi}-tqt1-devel
+%files -n %{libavahi}-tqt-devel
%defattr(-,root,root,-)
%{_includedir}/avahi-tqt/
%{_libdir}/libavahi-tqt.so
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 69ead7b..17a0453 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific building variables
+# TDE variables
%define tde_version 14.0.0
%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
@@ -102,16 +102,16 @@
##########
-%package -n %{libdbus}-1-tqt0-devel
+%package -n %{libdbus}-1-tqt-devel
Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files)
** Diff limit reached (max: 250 lines) **
|
||