Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libGLw for openSUSE:Factory checked in at 2022-06-08 14:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libGLw (Old) and /work/SRC/openSUSE:Factory/.libGLw.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libGLw" Wed Jun 8 14:24:40 2022 rev:18 rq:981160 version:8.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libGLw/libGLw.changes 2021-10-04 18:42:25.418297157 +0200 +++ /work/SRC/openSUSE:Factory/.libGLw.new.1548/libGLw.changes 2022-06-08 14:25:00.732509151 +0200 @@ -1,0 +2,8 @@ +Fri Jun 3 13:23:49 UTC 2022 - Jan Engelhardt <[email protected]> + +- Trim old specfile constructs +- Trim baselibs.conf; no other package in openSUSE:Factory + buildrequires it and the case for compat should at most exist + with 32-bit binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libGLw.spec ++++++ --- /var/tmp/diff_new_pack.AJqNBV/_old 2022-06-08 14:25:01.152509672 +0200 +++ /var/tmp/diff_new_pack.AJqNBV/_new 2022-06-08 14:25:01.156509676 +0200 @@ -1,7 +1,7 @@ # # spec file for package libGLw # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,6 @@ %define libversion 1 Name: libGLw -# Needs to be set in buildservice project, see 'osc meta prjconf X11:XOrg' -# for an example -%if 0%{?use_motif} != 0 -%define lname_m libGLwM%{libversion} -BuildRequires: openmotif-devel -%endif -%define lname libGLw%{libversion} -BuildRequires: pkgconfig -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xt) URL: http://www.mesa3d.org Provides: Mesa:%{_libdir}/libGLw.so.1 Version: 8.0.0 @@ -43,17 +32,21 @@ Source: glw-%{version}_%{date}_%{sha1}.tar.bz2 Source1: baselibs.conf Patch1: n_Use-newly-introduced-GLAPIVAR-for-variables.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Needs to be set in buildservice project, see 'osc meta prjconf X11:XOrg' +# for an example +%if 0%{?use_motif} != 0 +%define lname_m libGLwM%{libversion} +BuildRequires: openmotif-devel +%endif +%define lname libGLw%{libversion} +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xt) %description Xt/Motif OpenGL drawing area widget library shipped by the Mesa Project. - - -Authors: --------- - Brian Paul - %package -n %lname Summary: Xt OpenGL drawing area widget library # O/P added in 12.2 @@ -77,8 +70,6 @@ This package contains all necessary include files needed to develop applications that require these. -%if 0%{?use_motif} != 0 - %package -n %lname_m Summary: Motif OpenGL drawing area widget library # O/P added in 12.2 @@ -92,45 +83,40 @@ %description -n %lname_m Motif OpenGL drawing area widget library shipped by the Mesa Project. -%endif - %prep -%setup -q -n glw-%{version} -%patch1 -p1 +%autosetup -p1 -n glw-%{version} %build -%__mkdir build-GLw; cd build-GLw; %{__ln_s} -f ../configure +mkdir build-GLw; cd build-GLw; ln -sf ../configure %{configure} --srcdir=../ -%__make %{?_smp_mflags} OPT_FLAGS="$RPM_OPT_FLAGS" -%if 0%{?use_motif} != 0 -%__mkdir ../build-GLwM; cd ../build-GLwM; %{__ln_s} -f ../configure +%make_build OPT_FLAGS="%{optflags}" +%if 0%{?use_motif} +mkdir ../build-GLwM; cd ../build-GLwM; ln -sf ../configure %{configure} --srcdir=../ --enable-motif -%__make %{?_smp_mflags} OPT_FLAGS="$RPM_OPT_FLAGS" +%make_build OPT_FLAGS="%{optflags}" %endif %install %if 0%{?use_motif} != 0 cd build-GLwM -DESTDIR=$RPM_BUILD_ROOT %__make install -i=$(echo $RPM_BUILD_ROOT%{_libdir}/libGLw.so.*.*.*); mv $i ${i/libGLw.so/libGLwM.so}; +%make_install +i=$(echo %{buildroot}/%{_libdir}/libGLw.so.*.*.*); mv $i ${i/libGLw.so/libGLwM.so}; cd .. %endif cd build-GLw -DESTDIR=$RPM_BUILD_ROOT %__make install -i=$(echo $RPM_BUILD_ROOT%{_libdir}/libGLw.so.*.*.*); mv $i ${i/libGLw.so/libGLwXT.so}; -rm -f $RPM_BUILD_ROOT/%{_libdir}/libGLw.la $RPM_BUILD_ROOT/%{_libdir}/libGLw.a $RPM_BUILD_ROOT/%{_libdir}/libGLw.so.? $RPM_BUILD_ROOT/%{_libdir}/libGLw.so +%make_install +i=$(echo %{buildroot}/%{_libdir}/libGLw.so.*.*.*); mv $i ${i/libGLw.so/libGLwXT.so}; +rm -f %{buildroot}/%{_libdir}/libGLw.la %{buildroot}/%{_libdir}/libGLw.a %{buildroot}/%{_libdir}/libGLw.so.? %{buildroot}/%{_libdir}/libGLw.so %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) %doc README %{_libdir}/libGLwXT.so.1.* %files devel -%defattr(-,root,root) /usr/include/GL %{_libdir}/pkgconfig/glw.pc @@ -143,14 +129,12 @@ %preun devel [ $1 -eq 0 ] && rm -f %{_libdir}/libGLw.so || true -%if 0%{?use_motif} != 0 - %post -n %lname_m -p /sbin/ldconfig %postun -n %lname_m -p /sbin/ldconfig +%if 0%{?use_motif} %files -n %lname_m -%defattr(-,root,root) %doc README %{_libdir}/libGLwM.so.1.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.AJqNBV/_old 2022-06-08 14:25:01.188509716 +0200 +++ /var/tmp/diff_new_pack.AJqNBV/_new 2022-06-08 14:25:01.188509716 +0200 @@ -1,8 +1,5 @@ -libGLw1 -libGLw-devel - requires -libGLw-<targettype> - requires "libGLw1-<targettype> = <version>" -libGLwM1 - requires -libGLwM-<targettype> - requires "libGLwM1-<targettype> = <version>" +targettype 32bit package libGLw1 +targettype 32bit package libGLwM1 + requires -libGLwM-<targettype> + requires "libGLwM1-<targettype> = <version>"
