folkslinux
/
VMware-Photon-OS
mirror of https://github.com/vmware/photon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

version upgrades: glibmm libsigc++ pango fribidi 

glibmm: upgrade to v2.9.1
libsigc++: upgrade to v3.2.0
pango: upgrade to v1.90.0
fribidi: upgrade to v1.0.12

Change-Id: I8945f8cea1514f0b2fc5d9213ddbd6c9a72ffca0
Signed-off-by: Shreenidhi Shedi <sshedi@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/18529
This commit is contained in:
Shreenidhi Shedi 2022-11-02 15:31:02 -07:00 committed by Michelle Wang
parent e954d512e3
commit 9427c40f9a
7 changed files with 301 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
SPECS/cairo/cairo.spec
View File

@ -1,14 +1,16 @@
Summary: A 2D graphics library.
Name: cairo
Version: 1.17.6
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://www.linuxfromscratch.org/blfs/view/svn/x/cairo.html
URL: https://cairographics.org
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
Source0: http://cairographics.org/releases/%{name}-%{version}.tar.xz
%define sha512 cairo=15d9a82097b9c5a43071ff9fbfe90d7aaee5fddb84f519cdddfe312c5fc7248a50b73a5351922de2aaafa4b2e86f911b3147609538346f8a7635f34d631c9146
Source0: http://cairographics.org/releases/%{name}-%{version}.tar.xz
%define sha512 %{name}=15d9a82097b9c5a43071ff9fbfe90d7aaee5fddb84f519cdddfe312c5fc7248a50b73a5351922de2aaafa4b2e86f911b3147609538346f8a7635f34d631c9146
BuildRequires: pkg-config
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
@ -16,40 +18,46 @@ BuildRequires: pixman-devel
BuildRequires: freetype2-devel
BuildRequires: fontconfig-devel
BuildRequires: glib-devel
Requires: pixman
Requires: glib
Requires: libpng
Requires: expat
Requires: freetype2
Requires: fontconfig
Requires: binutils-libs
%description
Cairo is a 2D graphics library with support for multiple output devices.
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
Requires: freetype2-devel
Requires: pixman-devel
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
Requires: freetype2-devel
Requires: pixman-devel
Requires: libpng-devel
%description devel
%description devel
It contains the libraries and header files to create applications
%prep
%autosetup
%autosetup -p1
%build
export CFLAGS="-O3 -fPIC"
# Fix build with latest binutils
sed 's/PTR/void */' -i util/cairo-trace/lookup-symbol.c
%configure \
--enable-xlib=no \
--enable-xlib=no \
--enable-xlib-render=no \
--enable-win32=no \
--disable-static
make %{?_smp_mflags}
--disable-static \
%make_build
%install
make DESTDIR=%{buildroot} %{?_smp_mflags} install
find %{buildroot} -name '*.la' -delete
%make_install %{?_smp_mflags}
%post
/sbin/ldconfig
@ -57,11 +65,14 @@ find %{buildroot} -name '*.la' -delete
%postun
/sbin/ldconfig
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/*.so.*
%{_libdir}/cairo/*.so*
%{_libdir}/%{name}/*.so
%files devel
%defattr(-,root,root)
@ -72,6 +83,8 @@ find %{buildroot} -name '*.la' -delete
%{_datadir}/gtk-doc/html/%{name}/*
%changelog
* Sun Nov 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 1.17.6-3
- Fix packaging and spec improvements
* Thu Sep 01 2022 Vamsi Krishna Brahmajosyula <vbrahmajosyula@vmware.com> 1.17.6-2
- Fix build with latest binutils
* Fri May 20 2022 Gerrit Photon <photon-checkins@vmware.com> 1.17.6-1

65
SPECS/fribidi/fribidi.spec Normal file
View File

@ -0,0 +1,65 @@
Summary: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi).
Name: fribidi
Version: 1.0.12
Release: 1%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://fribidi.org
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
Source0: https://github.com/fribidi/fribidi/releases/download/v%{version}/%{name}-%{version}.tar.xz
%define sha512 %{name}=cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49
BuildRequires: meson
BuildRequires: ninja-build
%description
A library to handle bidirectional scripts (for example Hebrew, Arabic),
so that the display is done in the proper way; while the text data itself
is always written in logical order.
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
%description devel
Include files and libraries needed for developing applications which use
FriBidi.
%prep
%autosetup -p1
%build
%meson \
-Ddocs=false
%meson_build
%install
%meson_install
%if 0%{?with_check}
%check
%meson_test
%endif
%clean
rm -rf %{buildroot}/*
%ldconfig_scriptlets
%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%changelog
* Tue Nov 8 2022 Michelle Wang <michellew@vmware.com> 1.0.12-1
- Initial version. Required by pango-1.50.11.

65
SPECS/glibmm/glibmm.spec
View File

@ -1,28 +1,31 @@
Summary: C++ interface to the glib
Name: glibmm
Version: 2.65.3
Release: 2%{?dist}
License: LGPLv2+
URL: http://ftp.gnome.org/pub/GNOME/sources/glibmm
Group: Applications/System
Vendor: VMware, Inc.
Summary: C++ interface to the glib
Name: glibmm
Version: 2.74.0
Release: 1%{?dist}
License: LGPLv2+
URL: http://ftp.gnome.org/pub/GNOME/sources/glibmm
Group: Applications/System
Vendor: VMware, Inc.
Distribution: Photon
Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.53/%{name}-%{version}.tar.xz
%define sha512 %{name}=d9b9dae4fd9c67bbf6892b9e834d104699592d8aa2ac816cd9690945ddc5b8a8adf06ff8ec4f3ff943a85336f63172d23219e3f7f1e31b65d3eb2ac1ab0a3b80
Source0: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.74/%{name}-%{version}.tar.xz
%define sha512 %{name}=29c16a6c921fb135721c39b5328e0b45e09c500c65175199c1ec5ee75bdd5fb907072389c6980da3bf8fac0846235af5580f692706eb00d26947804daa1c99c9
BuildRequires: python3-devel
BuildRequires: libsigc++-devel >= 2.10.0
BuildRequires: glib-devel glib-schemas
BuildRequires: libsigc++-devel >= 3.2.0
BuildRequires: glib-devel >= 2.74.1
BuildRequires: glib-schemas >= 2.74.1
BuildRequires: meson
%if 0%{?with_check}
BuildRequires: glib-networking
%endif
Requires: libsigc++ >= 2.10.0
Requires: glib >= 2.50.0
Requires: gobject-introspection >= 1.50.0
Requires: XML-Parser
Requires: libsigc++ >= 3.2.0
Requires: glib >= 2.74.1
Requires: gobject-introspection >= 1.74.0
Requires: XML-Parser
Requires: perl
%description
gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2.
@ -33,7 +36,8 @@ a comprehensive set of widget classes that can be freely combined to quickly cre
Summary: Header files for glibmm
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: glib-devel libsigc++
Requires: glib-devel >= 2.74.1
Requires: libsigc++ >= 3.2.0
%description devel
These are the header files of glibmm.
@ -42,37 +46,38 @@ These are the header files of glibmm.
%autosetup -p1
%build
%configure
%make_build
%meson
%meson_build
%install
%make_install %{?_smp_mflags}
%meson_install
%if 0%{?with_check}
%check
#need read content from /etc/fstab, which couldn't be empty
echo '#test' > /etc/fstab
export GIO_EXTRA_MODULES=/usr/lib/gio/modules; make check
%meson_test
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}/*
%ldconfig_scriptlets
%files
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/glibmm-2.66/proc/*
%{_libdir}/glibmm-2.68/proc/*
%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/glibmm-2.66/include/*
%{_libdir}/giomm-2.66/include/*
%{_libdir}/glibmm-2.68/include/*
%{_libdir}/giomm-2.68/include/*
%{_includedir}/*
%{_datadir}/*
%{_libdir}/pkgconfig/*.pc
%changelog
* Sun Nov 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 2.74.0-1
- Upgrade to v2.74.0
* Sun Aug 07 2022 Shreenidhi Shedi <sshedi@vmware.com> 2.65.3-2
- Remove .la files
* Mon Sep 21 2020 Gerrit Photon <photon-checkins@vmware.com> 2.65.3-1

57
SPECS/harfbuzz/harfbuzz.spec
View File

@ -1,41 +1,50 @@
Summary: opentype text shaping engine
Name: harfbuzz
Version: 2.6.7
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
URL: http://harfbuzz.org
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
Source0: https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.xz
%define sha1 harfbuzz=caeec8262fbd90a77b62c928b6c033a1b104546b
Source0: https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.xz
%define sha512 %{name}=6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de
BuildRequires: glib-devel
BuildRequires: freetype2
BuildRequires: freetype2-devel
Requires: glib
Requires: freetype2
%description
HarfBuzz is an implementation of the OpenType Layout engine.
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
Requires: glib-devel
%description devel
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
Requires: glib-devel
%description devel
It contains the libraries and header files to create applications
%prep
%setup -q
%autosetup -p1
%build
%configure
make %{?_smp_mflags}
%make_build
%install
make DESTDIR=%{buildroot} install
find %{buildroot} -name '*.la' -delete
%make_install %{?_smp_mflags}
%if 0%{?with_check}
%check
make %{?_smp_mflags} -k check
make %{?_smp_mflags} check
%endif
%clean
rm -rf %{buildroot}/*
%post
/sbin/ldconfig
@ -45,7 +54,7 @@ make %{?_smp_mflags} -k check
%files
%defattr(-,root,root)
%{_libdir}/*.so*
%{_libdir}/*.so.*
%{_bindir}/*
%files devel
@ -58,11 +67,13 @@ make %{?_smp_mflags} -k check
%{_libdir}/cmake/harfbuzz/harfbuzz-config.cmake
%changelog
* Thu Jul 16 2020 Gerrit Photon <photon-checkins@vmware.com> 2.6.7-1
- Automatic Version Bump
* Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.9.0-1
- Update to version 1.9.0
* Thu Dec 07 2017 Alexey Makhalov <amakhalov@vmware.com> 1.4.5-2
- Add glib requirement
* Wed Apr 05 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.4.5-1
- Initial version
* Sun Nov 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 2.6.7-2
- Spec fixes
* Thu Jul 16 2020 Gerrit Photon <photon-checkins@vmware.com> 2.6.7-1
- Automatic Version Bump
* Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.9.0-1
- Update to version 1.9.0
* Thu Dec 07 2017 Alexey Makhalov <amakhalov@vmware.com> 1.4.5-2
- Add glib requirement
* Wed Apr 05 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.4.5-1
- Initial version

35
SPECS/libsigc++/libsigc++.spec
View File

@ -1,31 +1,33 @@
Summary: Library that Implements a typesafe callback system for standard C++.
Name: libsigc++
Version: 3.0.4
Release: 5%{?dist}
License: LGPLv2+
URL: http://libsigc.sourceforge.net
Group: Applications/System
Vendor: VMware, Inc.
Summary: Library that Implements a typesafe callback system for standard C++.
Name: libsigc++
Version: 3.2.0
Release: 1%{?dist}
License: LGPLv2+
URL: http://libsigc.sourceforge.net
Group: Applications/System
Vendor: VMware, Inc.
Distribution: Photon
Source0: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.99/%{name}-%{version}.tar.xz
%define sha512 libsigc=b84ae7da6708e02302d08e295d6a566f12fb2c6f0d02f811661a0a541d7969e96a1e920218394dd109b3f362d102f2956aa968539710fa180d7d97e9676fb83d
%define sha512 libsigc=91315cecc79a1ad6ea165b66a13a5afd4e5bc101842f9d4c58811ea78536c07fc8821c51aa5110a032ed71c09f85790b3a02f2ad7fe8cc3aed6e03b2bafcd70c
BuildRequires: mm-common
BuildRequires: libxslt-devel
BuildRequires: doxygen
Requires: libgcc
%description
It allows to define signals and to connect those signals to any callback function,
either global or a member function, regardless of whether it is static or virtual.
It also contains adaptor classes for connection of dissimilar callbacks,
and has an ease of use unmatched by other C++ callback libraries.
%package devel
Summary: Development & header files for %{name}
Requires: %{name} = %{version}-%{release}
%package devel
Summary: Development & header files for %{name}
Requires: %{name} = %{version}-%{release}
%description devel
%description devel
Development & header files for %{name}
%prep
@ -39,12 +41,17 @@ sh ./autogen.sh --prefix=%{_prefix}
%install
%make_install %{?_smp_mflags}
%if 0%{?with_check}
%check
make %{?_smp_mflags} check
%endif
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%{_libdir}/*.so.*
@ -57,6 +64,8 @@ make %{?_smp_mflags} check
%{_includedir}/*
%changelog
* Sun Nov 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 3.2.0-1
- Upgrade to v3.2.0
* Fri Oct 07 2022 Shreenidhi Shedi <sshedi@vmware.com> 3.0.4-5
- Bump version as a part of libxslt upgrade
* Sun Aug 07 2022 Shreenidhi Shedi <sshedi@vmware.com> 3.0.4-4

104
SPECS/pango/pango.spec
View File

@ -1,58 +1,72 @@
Summary: library for laying out and rendering of text.
Name: pango
Version: 1.40.4
Release: 1%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://pango.org
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
Source0: https://download.gnome.org/sources/pango/1.40/%{name}-%{version}.tar.xz
%define sha1 pango=761458faab28cb70ba62e01ec9379d03bc5339c0
BuildRequires: glib-devel
BuildRequires: cairo
BuildRequires: cairo-devel
BuildRequires: libpng-devel
BuildRequires: fontconfig
BuildRequires: fontconfig-devel
BuildRequires: harfbuzz
BuildRequires: harfbuzz-devel
BuildRequires: freetype2
Requires: harfbuzz-devel
%description
Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit.
Summary: library for laying out and rendering of text.
Name: pango
Version: 1.50.11
Release: 1%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://pango.org
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
%description devel
It contains the libraries and header files to create applications
Source0: https://gitlab.gnome.org/GNOME/pango/-/archive/%{version}/%{name}-%{version}.tar.gz
%define sha512 %{name}=695b6d11dcb72918f699ea6441d67f4f9a9fa930131c6079b0aa689ee6910903a79cd308c5054fd3ccdd8efd390b3b56f1d0cbf27eaef7247315db2fe9710b7a
BuildRequires: glib-devel
BuildRequires: cairo-devel
BuildRequires: fontconfig-devel
BuildRequires: harfbuzz-devel
BuildRequires: freetype2-devel
BuildRequires: meson
BuildRequires: pkg-config
BuildRequires: fribidi-devel
BuildRequires: cmake
Requires: freetype2
Requires: fontconfig
Requires: fribidi
Requires: glib
Requires: harfbuzz
%description
Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit.
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
Requires: harfbuzz-devel
%description devel
It contains the libraries and header files to create applications
%prep
%setup -q
%autosetup -p1
%build
./configure \
--prefix=%{_prefix}
make %{?_smp_mflags}
%meson \
-Dlibthai=disabled \
-Dxft=disabled \
-Dintrospection=disabled
%meson_build
%install
make DESTDIR=%{buildroot} install
find %{buildroot} -name '*.la' -delete
%meson_install
%if 0%{?with_check}
%check
#These tests are known to fail. Hence sending exit 0
make %{?_smp_mflags} -k check || exit 0
%meson_test
%endif
%post
/sbin/ldconfig
%ldconfig_scriptlets
%postun
/sbin/ldconfig
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/*.so*
%{_datadir}/*
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root)
@ -61,5 +75,7 @@ make %{?_smp_mflags} -k check || exit 0
%{_libdir}/pkgconfig/*.pc
%changelog
* Tue Apr 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.40.4-1
- Initial version
* Sun Nov 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 1.50.11-1
- Upgrade to v1.50.11
* Tue Apr 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.40.4-1
- Initial version

99
SPECS/rrdtool/rrdtool.spec
View File

@ -1,61 +1,71 @@
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
Version: 1.8.0
Release: 1%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://oss.oetiker.ch/rrdtool/
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
Summary: Round Robin Database Tool to store and display time-series data
Name: rrdtool
Version: 1.8.0
Release: 2%{?dist}
License: LGPLv2 or MPLv1.1
URL: http://oss.oetiker.ch/rrdtool
Group: System Environment/Libraries
Vendor: VMware, Inc.
Distribution: Photon
Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v1.6.0/%{name}-%{version}.tar.gz
%define sha512 rrdtool=8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
Source0: https://github.com/oetiker/rrdtool-1.x/releases/download/v%{version}/%{name}-%{version}.tar.gz
%define sha512 %{name}=8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
BuildRequires: pkg-config
BuildRequires: libpng-devel
BuildRequires: pango-devel
BuildRequires: libxml2-devel
BuildRequires: pixman-devel
BuildRequires: freetype2-devel
BuildRequires: fontconfig-devel
BuildRequires: cairo-devel
BuildRequires: glib-devel
BuildRequires: systemd
BuildRequires: pkg-config
BuildRequires: libpng-devel
BuildRequires: pango-devel
BuildRequires: fribidi-devel
BuildRequires: libxml2-devel
BuildRequires: pixman-devel
BuildRequires: freetype2-devel
BuildRequires: fontconfig-devel
BuildRequires: cairo-devel
BuildRequires: glib-devel
BuildRequires: systemd-devel
Requires: systemd
Requires: libxml2
Requires: systemd
Requires: cairo
Requires: pango
Requires: libpng
%description
RRD is the Acronym for Round Robin Database. RRD is a system to store and
display time-series data.
RRD is the Acronym for Round Robin Database.
RRD is a system to store and display time-series data.
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
%description devel
It contains the libraries and header files to create applications
%package devel
Summary: Header and development files
Requires: %{name} = %{version}-%{release}
%description devel
It contains the libraries and header files to create applications.
%prep
%autosetup -p1
%build
%configure \
--disable-tcl \
--disable-python \
--disable-perl \
--disable-lua \
--disable-examples \
--disable-tcl \
--disable-python \
--disable-perl \
--disable-lua \
--disable-examples \
--with-systemdsystemunitdir=%{_unitdir} \
--disable-docs \
--disable-static
--disable-docs \
--disable-static
make %{?_smp_mflags}
%make_build
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
find %{buildroot} -name '*.la' -delete
%make_install %{?_smp_mflags}
#%%check
#make %{?_smp_mflags} -k check
%if 0%{?with_check}
%check
make check %{?_smp_mflags}
%endif
%clean
rm -rf %{buildroot}/*
%post
/sbin/ldconfig
@ -71,9 +81,8 @@ find %{buildroot} -name '*.la' -delete
%files
%defattr(-,root,root)
%{_bindir}/*
%{_libdir}/*.so*
%{_unitdir}/rrdcached.service
%{_unitdir}/rrdcached.socket
%{_libdir}/*.so.*
%{_unitdir}/*
%exclude %{_datadir}/locale/*
%files devel
@ -83,6 +92,8 @@ find %{buildroot} -name '*.la' -delete
%{_libdir}/pkgconfig/*.pc
%changelog
* Sun Nov 13 2022 Shreenidhi Shedi <sshedi@vmware.com> 1.8.0-2
- Bump version as a part of pango upgrade
* Tue Apr 19 2022 Gerrit Photon <photon-checkins@vmware.com> 1.8.0-1
- Automatic Version Bump
* Mon Jun 22 2020 Gerrit Photon <photon-checkins@vmware.com> 1.7.2-1