Hello community, here is the log from the commit of package dmd for openSUSE:Factory checked in at 2018-01-20 11:26:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmd (Old) and /work/SRC/openSUSE:Factory/.dmd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dmd" Sat Jan 20 11:26:32 2018 rev:6 rq:564052 version:2.078.0 Changes: -------- --- /work/SRC/openSUSE:Factory/dmd/dmd.changes 2018-01-03 13:39:28.380560391 +0100 +++ /work/SRC/openSUSE:Factory/.dmd.new/dmd.changes 2018-01-20 11:26:35.984688892 +0100 @@ -1,0 +2,9 @@ +Sat Jan 13 22:45:17 UTC 2018 - [email protected] + +- Update to 2.078.0 +- Update auto_bootstrap version to 2.078.0 +- Remove bootrap option for ldc since we have working bootstraping with dmd +- Did some more clean-up in spec of build flags that was wrong and redundant +- Update default dmd.conf with more accurate includes + +------------------------------------------------------------------- Old: ---- dmd-2.077.1.tar.gz dmd.2.076.1.linux.tar.xz druntime-2.077.1.tar.gz phobos-2.077.1.tar.gz New: ---- dmd-2.078.0.tar.gz dmd.2.078.0.linux.tar.xz druntime-2.078.0.tar.gz phobos-2.078.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmd.spec ++++++ --- /var/tmp/diff_new_pack.sTdLhS/_old 2018-01-20 11:26:37.868600789 +0100 +++ /var/tmp/diff_new_pack.sTdLhS/_new 2018-01-20 11:26:37.872600602 +0100 @@ -1,7 +1,7 @@ # # spec file for package dmd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,10 @@ %define auto_bootstrap 0 -%define build_with_ldc 0 -%define lname libphobos2-0_77 -%define soname 0.77 -%define phobos phobos -%define incbase %{_includedir}/dlang -%define include %{incbase}/dmd-%{version} +%define bootstrap_version 2.078.0 +%define sover 0_78 Name: dmd -Version: 2.077.1 +Version: 2.078.0 Release: 0 Summary: D Programming Language 2.0 License: BSL-1.0 @@ -33,23 +29,18 @@ Source: https://github.com/D-Programming-Language/dmd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://github.com/D-Programming-Language/druntime/archive/v%{version}.tar.gz#/druntime-%{version}.tar.gz Source2: https://github.com/D-Programming-Language/phobos/archive/v%{version}.tar.gz#/phobos-%{version}.tar.gz -Source8: http://downloads.dlang.org/releases/2.x/2.076.1/dmd.2.076.1.linux.tar.xz +Source8: http://downloads.dlang.org/releases/2.x/%{bootstrap_version}/dmd.%{bootstrap_version}.linux.tar.xz Source9: dmd.conf # PATCH-FIX-OPENSUSE dmd_use_tarball_bootstrap.diff So the tarball is not downloaded Patch0: dmd_use_tarball_bootstrap.diff +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: git BuildRequires: xz -Recommends: %{phobos}-devel -%if %{build_with_ldc} -BuildRequires: ldc >= 0.15.0 -BuildRequires: ldc-phobos-devel >= 0.15.0 -BuildRequires: ldc-runtime-devel >= 0.15.0 -%else +Recommends: phobos-devel %if !%{auto_bootstrap} -BuildRequires: %{phobos}-devel-static >= 2.075.0 -BuildRequires: dmd >= 2.075.0 -%endif +BuildRequires: dmd +BuildRequires: phobos-devel-static %endif %description @@ -59,39 +50,32 @@ bounds checking, design by contract features, and a concurrency-aware type system. -%package -n %{phobos} -Summary: Standard Library for DMD -Group: Development/Libraries/Other - -%description -n %{phobos} -Phobos is the standard library for the D Programming Language. - -%package -n %{lname} +%package -n libphobos2-%{sover} Summary: Standard library for the D language Group: System/Libraries -%description -n %{lname} +%description -n libphobos2-%{sover} Phobos is the standard library for the D Programming Language. This package contains the shared library needed to run programs compiled with dmd. -%package -n %{phobos}-devel +%package -n phobos-devel Summary: Development files for the D standard library Group: Development/Libraries/Other -Requires: %{lname} = %{version} +Requires: libphobos2-%{sover} = %{version} -%description -n %{phobos}-devel +%description -n phobos-devel Phobos is the standard library for the D Programming Language. This package contains the includes needed to compile programs against Phobos. -%package -n %{phobos}-devel-static +%package -n phobos-devel-static Summary: Development files for the D standard library Group: Development/Libraries/Other -Requires: %{phobos}-devel = %{version} +Requires: phobos-devel = %{version} -%description -n %{phobos}-devel-static +%description -n phobos-devel-static Phobos is the standard library for the D Programming Language. This package contains the static library for static linking. You don't need @@ -103,147 +87,95 @@ %setup -q -T -D -a 2 %patch0 -p1 echo %{version} > phobos-%{version}/VERSION -cd /home/abuild/rpmbuild/BUILD +cd %{_builddir} ln -s dmd-%{version} dmd +ln -s druntime-%{version} druntime +ln -s phobos-%{version} phobos mv dmd-%{version}/druntime-%{version} . mv dmd-%{version}/phobos-%{version} . %build -# DMD -make %{?_smp_mflags} -f posix.mak \ -%if %{auto_bootstrap} +# dmd +cd .. +pushd dmd + make %{?_smp_mflags} -f posix.mak \ + %if %{auto_bootstrap} AUTO_BOOTSTRAP=1 \ -%endif -%if %{build_with_ldc} - HOST_DMD=ldmd2 \ -%endif -%ifarch x86_64 - MODEL=64 \ -%endif -%ifarch i586 - MODEL=32 \ + %endif + BUILD=release \ PIC=1 \ -%endif - RELEASE=1 \ - TARGET=LINUX + RELEASE=1 +popd -# Phobos -cd ../phobos-%{version} -make %{?_smp_mflags} -f posix.mak \ -%if %{auto_bootstrap} - AUTO_BOOTSTRAP=1 \ -%endif -%ifarch x86_64 - MODEL=64 \ -%endif -%ifarch i586 - MODEL=32 \ +# druntime +pushd druntime + make %{?_smp_mflags} -f posix.mak \ + BUILD=release \ + DMD="../dmd/generated/linux/release/*/dmd" \ PIC=1 \ -%endif - VERSION=VERSION DMD="$PWD/../dmd/src/dmd" DRUNTIME_PATH="$PWD/../druntime-%{version}" + RELEASE=1 +popd -%install -# DMD -make install -f posix.mak \ -%if %{auto_bootstrap} - AUTO_BOOTSTRAP=1 \ -%endif -%if %{build_with_ldc} - HOST_DMD=ldmd2 \ -%endif -%ifarch x86_64 - MODEL=64 \ -%endif -%ifarch i586 - MODEL=32 \ +# phobos +pushd phobos + make %{?_smp_mflags} -f posix.mak \ + BUILD=release \ + DMD="../dmd/generated/linux/release/*/dmd" \ PIC=1 \ -%endif - RELEASE=1 \ - TARGET=LINUX INSTALL_DIR=%{buildroot} + RELEASE=1 +popd -mkdir -p %{buildroot}%{_bindir} -mv %{buildroot}/linux/bin*/dmd %{buildroot}%{_bindir}/dmd +%install +# install files manually since the install script distributed put files all over the place +# dmd +install -dm755 %{buildroot}%{_bindir} +install -Dm755 %{_builddir}/dmd/generated/linux/release/*/dmd %{buildroot}%{_bindir}/dmd -mkdir -p %{buildroot}%{_datadir}/%{name} -mv %{buildroot}/man %{buildroot}%{_datadir} -mv %{buildroot}/samples %{buildroot}%{_datadir}/%{name} -rm %{buildroot}%{_datadir}/%{name}/samples/.gitignore +install -dm755 %{buildroot}%{_sysconfdir} +install -Dm644 %{_sourcedir}/dmd.conf %{buildroot}%{_sysconfdir}/dmd.conf -# avoid duplicates -rm %{buildroot}/dmd-boostlicense.txt -rm %{buildroot}/linux/bin*/dmd.conf +install -dm755 %{buildroot}%{_mandir} +cp -r %{_builddir}/dmd/docs/man/* %{buildroot}%{_mandir}/ -mkdir -p %{buildroot}%{_sysconfdir}/ -cat %{_sourcedir}/dmd.conf | sed "s/@VERSION@/%{version}/g" > %{buildroot}%{_sysconfdir}/%{name}.conf +install -dm755 %{buildroot}%{_datadir}/licenses/dmd +install -Dm644 %{_builddir}/dmd/LICENSE.txt %{buildroot}%{_datadir}/licenses/dmd/LICENSE.txt -# Phobos -cd .. -pushd phobos-%{version} -make install -f posix.mak \ -%if %{auto_bootstrap} - AUTO_BOOTSTRAP=1 \ -%endif -%ifarch x86_64 - MODEL=64 \ -%endif -%ifarch i586 - MODEL=32 \ - PIC=1 \ -%endif - VERSION=VERSION DMD="$PWD/../dmd/src/dmd" DRUNTIME_PATH="$PWD/../druntime-%{version}" INSTALL_DIR=%{buildroot} +install -dm755 %{buildroot}%{_datadir}/%{name}/samples +cp -r %{_builddir}/dmd/samples/* %{buildroot}%{_datadir}/dmd/samples/ -# Relocate installed files into proper directories -mkdir -p %{buildroot}%{_libdir} -mv %{buildroot}/linux/lib*/* %{buildroot}%{_libdir} -mkdir -p %{buildroot}%include/ -mv %{buildroot}/src/phobos %{buildroot}%include/ -popd +# phobos +install -dm755 %{buildroot}%{_libdir} +cp -a $(find %{_builddir}/phobos/generated/linux/release/ \( -iname "*.a" -a \! -iname "*.so.a" \) -o \( -iname "*.so*" -a \! -iname "*.o" -a \! -iname "*.a" \) ) %{buildroot}%{_libdir} -# Repeat for druntime -pushd druntime-%{version} -make install -f posix.mak \ -%if %{auto_bootstrap} - AUTO_BOOTSTRAP=1 \ -%endif -%ifarch x86_64 - MODEL=64 \ -%endif -%ifarch i586 - MODEL=32 \ - PIC=1 \ -%endif - DMD="$PWD/../src/dmd" INSTALL_DIR=%{buildroot} - -mv %{buildroot}/src/druntime/import %{buildroot}%include/druntime -popd +install -dm755 %{buildroot}%{_includedir}/dlang/dmd +cp -r %{_builddir}/phobos/{*.d,etc,std} %{buildroot}%{_includedir}/dlang/dmd +cp -r %{_builddir}/druntime/import/* %{buildroot}%{_includedir}/dlang/dmd/ -# Remove duplicates and files not packaged by upstream -rm -rf %{buildroot}/lib -rm %{buildroot}/*LICENSE.txt -rm -rf %{buildroot}%include/phobos%{_sysconfdir}/c/zlib +%fdupes %{buildroot} -/sbin/ldconfig -N %{buildroot}/%{_libdir} +/sbin/ldconfig -N %{buildroot}%{_libdir} -%post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%post -n libphobos2-%{sover} -p /sbin/ldconfig +%postun -n libphobos2-%{sover} -p /sbin/ldconfig %files -%doc LICENSE.txt README.md -%config %{_sysconfdir}/%{name}.conf +%doc README.md +%license LICENSE.txt +%config %{_sysconfdir}/dmd.conf %{_bindir}/dmd -%{_datadir}/%{name} +%{_datadir}/dmd %{_mandir}/man*/* -%files -n %{lname} -%{_libdir}/libphobos2.so.%{soname} -%{_libdir}/libphobos2.so.%{soname}.* - -%files -n %{phobos}-devel -%dir %{incbase} -%include/ +%files -n libphobos2-%{sover} +%{_libdir}/libphobos2.so.* + +%files -n phobos-devel +%dir %{_includedir}/dlang +%dir %{_includedir}/dlang/dmd +%{_includedir}/dlang/dmd/* %{_libdir}/libphobos2.so -%files -n %{phobos}-devel-static +%files -n phobos-devel-static %{_libdir}/libphobos2.a %changelog ++++++ dmd-2.077.1.tar.gz -> dmd-2.078.0.tar.gz ++++++ ++++ 615972 lines of diff (skipped) ++++++ dmd.2.076.1.linux.tar.xz -> dmd.2.078.0.linux.tar.xz ++++++ /work/SRC/openSUSE:Factory/dmd/dmd.2.076.1.linux.tar.xz /work/SRC/openSUSE:Factory/.dmd.new/dmd.2.078.0.linux.tar.xz differ: char 25, line 1 ++++++ dmd.conf ++++++ --- /var/tmp/diff_new_pack.sTdLhS/_old 2018-01-20 11:26:39.036546169 +0100 +++ /var/tmp/diff_new_pack.sTdLhS/_new 2018-01-20 11:26:39.040545982 +0100 @@ -13,7 +13,7 @@ ; [Environment32] -DFLAGS=-I/usr/include/dlang/dmd-@VERSION@/phobos -I/usr/include/dlang/dmd-@VERSION@/druntime -L-L/usr/lib -L--export-dynamic -fPIC +DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib -L--export-dynamic -fPIC [Environment64] -DFLAGS=-I/usr/include/dlang/dmd-@VERSION@/phobos -I/usr/include/dlang/dmd-@VERSION@/druntime -L-L/usr/lib64 -L--export-dynamic -fPIC \ No newline at end of file +DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib64 -L--export-dynamic -fPIC \ No newline at end of file ++++++ dmd_use_tarball_bootstrap.diff ++++++ --- /var/tmp/diff_new_pack.sTdLhS/_old 2018-01-20 11:26:39.060545046 +0100 +++ /var/tmp/diff_new_pack.sTdLhS/_new 2018-01-20 11:26:39.064544860 +0100 @@ -1,12 +1,12 @@ -diff -Naur dmd-2.076.1/src/posix.mak dmd-2.076.1.orig/src/posix.mak ---- dmd-2.076.1/src/posix.mak 2017-10-09 13:25:35.000000000 +0200 -+++ dmd-2.076.1.orig/src/posix.mak 2017-10-26 14:45:53.888689248 +0200 -@@ -435,7 +435,7 @@ +diff -Naur dmd-2.078.0/src/posix.mak dmd-2.078.0.orig/src/posix.mak +--- dmd-2.078.0.orig/src/posix.mak 2018-01-02 21:51:20.000000000 +0100 ++++ dmd-2.078.0/src/posix.mak 2018-01-05 20:52:07.915337173 +0100 +@@ -491,7 +491,7 @@ $(HOST_DMD_PATH): mkdir -p ${HOST_DMD_ROOT} ifneq (,$(shell which xz 2>/dev/null)) - curl -fsSL ${HOST_DMD_URL}.tar.xz | tar -C ${HOST_DMD_ROOT} -Jxf - || rm -rf ${HOST_DMD_ROOT} -+ tar -C ${HOST_DMD_ROOT} -Jxf ~/rpmbuild/SOURCES/dmd.2.076.1.linux.tar.xz || rm -rf ${HOST_DMD_ROOT} ++ tar -C ${HOST_DMD_ROOT} -Jxf ~/rpmbuild/SOURCES/dmd.2.078.0.linux.tar.xz || rm -rf ${HOST_DMD_ROOT} else TMPFILE=$$(mktemp deleteme.XXXXXXXX) && curl -fsSL ${HOST_DMD_URL}.zip > $${TMPFILE}.zip && \ unzip -qd ${HOST_DMD_ROOT} $${TMPFILE}.zip && rm $${TMPFILE}.zip; ++++++ druntime-2.077.1.tar.gz -> druntime-2.078.0.tar.gz ++++++ ++++ 7209 lines of diff (skipped) ++++++ phobos-2.077.1.tar.gz -> phobos-2.078.0.tar.gz ++++++ ++++ 18653 lines of diff (skipped)
