summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-02 19:09:23 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-02 19:09:23 +0200
commit5bd8508283f096e231cad2ffe348866b73e441f7 (patch)
tree0c43dc66a6bba9892cb8e6eae60502493078b9c3
parentbec23ad3d7863468f4285f61aa0ff7b9a68efa7f (diff)
downloadtde-packaging-5bd8508283f096e231cad2ffe348866b73e441f7.tar.gz
tde-packaging-5bd8508283f096e231cad2ffe348866b73e441f7.zip
RPM Packaging: update libart_lgpl
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec14
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec14
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec14
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec175
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec2
5 files changed, 112 insertions, 107 deletions
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 57e8c27b0..83dcd2ec5 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 @@ into a TQt main loop application.
##########
-%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: %{_lib}avahi-client-devel
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 @@ print to, files to look at and people to talk to.
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 69ead7bfa..17a045350 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 @@ See the dbus description for more information about D-BUS in general.
##########
-%package -n %{libdbus}-1-tqt0-devel
+%package -n %{libdbus}-1-tqt-devel
Summary: dbus bindings for the Trinity Qt [TQt] interface (Development Files)
Group: Development/Libraries/C and C++
-Provides: libdbus-1-tqt0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libdbus-1-tqt-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-tqt-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.
@@ -120,13 +120,13 @@ This package provides bindings for the Trinity Qt TQt interface.
See the dbus description for more information about D-BUS in general.
-%post -n %{libdbus}-1-tqt0-devel
+%post -n %{libdbus}-1-tqt-devel
/sbin/ldconfig || :
-%postun -n %{libdbus}-1-tqt0-devel
+%postun -n %{libdbus}-1-tqt-devel
/sbin/ldconfig || :
-%files -n %{libdbus}-1-tqt0-devel
+%files -n %{libdbus}-1-tqt-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 89908b295..db9237f94 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-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}
@@ -104,16 +104,16 @@ See the dbus description for more information about D-BUS in general.
##########
-%package -n %{libdbus}-tqt-1-0-devel
+%package -n %{libdbus}-tqt-1-devel
Summary: Simple inter-process messaging system (TQt interface)
Group: Development/Libraries/C and C++
-Provides: libdbus-tqt-1-0-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: libdbus-tqt-1-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-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.
@@ -123,13 +123,13 @@ Qt interface to D-BUS.
See the dbus description for more information about D-BUS in general.
-%post -n %{libdbus}-tqt-1-0-devel
+%post -n %{libdbus}-tqt-1-devel
/sbin/ldconfig || :
-%postun -n %{libdbus}-tqt-1-0-devel
+%postun -n %{libdbus}-tqt-1-devel
/sbin/ldconfig || :
-%files -n %{libdbus}-tqt-1-0-devel
+%files -n %{libdbus}-tqt-1-devel
%defattr(-,root,root,-)
%{_includedir}/dbus-1.0/*
%{_libdir}/libdbus-tqt-1.so
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 3d29ee9f0..afbbda311 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -15,27 +15,22 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
# TDE variables
%define tde_version 14.0.0
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_datadir %{tde_prefix}/share
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define _docdir %{tde_datadir}/doc
+
+%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%define libart %{_lib}art
+%else
+%define libart libart
+%endif
Name: trinity-libart-lgpl
Version: 2.3.22
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-Summary: Library of functions for 2D graphics - runtime files
-Group: System Environment/Libraries
+Summary: Library of functions for 2D graphics
+Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -47,15 +42,14 @@ License: LGPLv2+
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
+Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqt3-devel >= 3.5.0
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-
BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: libtool
%description
A library of functions for 2D graphics supporting a superset of the
@@ -64,89 +58,102 @@ and illustration programs. It is written in optimized C, and is fully
compatible with C++. With a small footprint of 10,000 lines of code, it is
especially suitable for embedded applications.
+##########
+
+%package -n %{libart}_lgpl_2-2
+Summary: Library of functions for 2D graphics - runtime files
+Group: System/Libraries
+Provides: libart_lgpl_2-2 = %{version}-%{release}
+
+%description -n %{libart}_lgpl_2-2
+A library of functions for 2D graphics supporting a superset of the
+PostScript imaging model, designed to be integrated with graphics, artwork,
+and illustration programs. It is written in optimized C, and is fully
+compatible with C++. With a small footprint of 10,000 lines of code, it is
+especially suitable for embedded applications.
-%post
+%post -n %{libart}_lgpl_2-2
/sbin/ldconfig || :
-%postun
+%postun -n %{libart}_lgpl_2-2
/sbin/ldconfig || :
-%files
+%files -n %{libart}_lgpl_2-2
%defattr(-,root,root,-)
-%{tde_libdir}/libart_lgpl_2.so.2
-%{tde_libdir}/libart_lgpl_2.so.2.3.21
+%{_libdir}/libart_lgpl_2.so.2
+%{_libdir}/libart_lgpl_2.so.2.3.21
##########
-%package devel
+%package -n %{libart}_lgpl-devel
Summary: Library of functions for 2D graphics - development files
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{libart}_lgpl_2-2 = %{version}-%{release}
-%description devel
+%description -n %{libart}_lgpl-devel
A library of functions for 2D graphics supporting a superset of the
PostScript imaging model, designed to be integrated with graphics, artwork,
and illustration programs. It is written in optimized C, and is fully
compatible with C++. With a small footprint of 10,000 lines of code, it is
especially suitable for embedded applications.
-%post devel
+%post -n %{libart}_lgpl-devel
/sbin/ldconfig || :
-%postun devel
+%postun -n %{libart}_lgpl-devel
/sbin/ldconfig || :
-%files devel
+%files -n %{libart}_lgpl-devel
%defattr(-,root,root,-)
-%{tde_bindir}/libart2-config
-%{tde_libdir}/libart_lgpl_2.a
-%{tde_libdir}/libart_lgpl_2.la
-%{tde_libdir}/libart_lgpl_2.so
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_alphagamma.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_bpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_config.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_filterlevel.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_gray_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_misc.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pathcode.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_pixbuf.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_point.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rect_uta.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_gradient.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_mask.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_render_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgb_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_rgba.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_intersect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_ops.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_point.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_svp_wind.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_ops.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_rect.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_uta_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_dash.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/art_vpath_svp.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart-features.h
-%{tde_tdeincludedir}/libart-2.0/libart_lgpl/libart.h
-%{tde_libdir}/pkgconfig/libart-2.0.pc
+%{_bindir}/libart2-config
+%{_libdir}/libart_lgpl_2.a
+%{_libdir}/libart_lgpl_2.la
+%{_libdir}/libart_lgpl_2.so
+%{_includedir}/libart-2.0/libart_lgpl/art_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_alphagamma.h
+%{_includedir}/libart-2.0/libart_lgpl/art_bpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_config.h
+%{_includedir}/libart-2.0/libart_lgpl/art_filterlevel.h
+%{_includedir}/libart-2.0/libart_lgpl/art_gray_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_misc.h
+%{_includedir}/libart-2.0/libart_lgpl/art_pathcode.h
+%{_includedir}/libart-2.0/libart_lgpl/art_pixbuf.h
+%{_includedir}/libart-2.0/libart_lgpl/art_point.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rect_uta.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_gradient.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_mask.h
+%{_includedir}/libart-2.0/libart_lgpl/art_render_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_a_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_bitmap_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_pixbuf_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_rgba_affine.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgb_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_rgba.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_intersect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_ops.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_point.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_render_aa.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_vpath_stroke.h
+%{_includedir}/libart-2.0/libart_lgpl/art_svp_wind.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_ops.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_rect.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/art_uta_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_bpath.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_dash.h
+%{_includedir}/libart-2.0/libart_lgpl/art_vpath_svp.h
+%{_includedir}/libart-2.0/libart_lgpl/libart-features.h
+%{_includedir}/libart-2.0/libart_lgpl/libart.h
+%{_libdir}/pkgconfig/libart-2.0.pc
##########
@@ -166,16 +173,14 @@ autoreconf -fiv
%build
unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+ --prefix=%{_prefix} \
+ --exec-prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --includedir=%{_includedir} \
\
--disable-dependency-tracking
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index ea62b8946..4cc81241a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -15,7 +15,7 @@
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
-# TDE specific variables
+# TDE variables
%define tde_version 14.0.0
%if 0%{?mdkversion} || 0%{?mdkversion} || 0%{?pclinuxos}