Hello community, here is the log from the commit of package harfbuzz for openSUSE:Factory checked in at 2015-06-01 10:09:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/harfbuzz (Old) and /work/SRC/openSUSE:Factory/.harfbuzz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "harfbuzz" Changes: -------- --- /work/SRC/openSUSE:Factory/harfbuzz/harfbuzz.changes 2015-05-05 00:55:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.harfbuzz.new/harfbuzz.changes 2015-06-01 10:09:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 5 08:28:46 UTC 2015 - [email protected] + +- Revert the introduction of harfbuzz-bootstrap: it did not help to + work around the cycle. + +------------------------------------------------------------------- Old: ---- harfbuzz-bootstrap-rpmlintrc harfbuzz-bootstrap.changes harfbuzz-bootstrap.spec pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ harfbuzz.spec ++++++ --- /var/tmp/diff_new_pack.1gTSqP/_old 2015-06-01 10:09:35.000000000 +0200 +++ /var/tmp/diff_new_pack.1gTSqP/_new 2015-06-01 10:09:35.000000000 +0200 @@ -16,7 +16,6 @@ # -%global build_bootstrap 0 Name: harfbuzz Version: 0.9.40 Release: 0 @@ -28,14 +27,6 @@ Source99: baselibs.conf BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{build_bootstrap} -Source1000: harfbuzz-bootstrap-rpmlintrc -# Generation of pkgconfig(foo) provides for the bootstrap package -BuildRequires: pkg-config -# The bootstrap package is not supposed to be used by end users -Requires: this-is-only-for-build-envs -%else -BuildRequires: harfbuzz-bootstrap BuildRequires: pkgconfig(cairo) >= 1.8.0 BuildRequires: pkgconfig(cairo-ft) BuildRequires: pkgconfig(freetype2) >= 12.0.6 @@ -45,17 +36,13 @@ BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(icu-uc) -#!BuildIgnore: libharfbuzz0 -%endif %description HarfBuzz is an OpenType text shaping engine. -%if ! %{build_bootstrap} %package -n libharfbuzz0 Summary: An OpenType text shaping engine Group: System/Libraries -Obsoletes: harfbuzz-bootstrap = %{version} %description -n libharfbuzz0 HarfBuzz is an OpenType text shaping engine. @@ -74,18 +61,11 @@ %description tools HarfBuzz is an OpenType text shaping engine. -%endif - %package devel Summary: An OpenType text shaping engine -- Development Files Group: Development/Libraries/C and C++ -%if %{build_bootstrap} -Requires: %{name} = %{version} -Conflicts: harfbuzz-devel -%else Requires: libharfbuzz-icu0 = %{version} Requires: libharfbuzz0 = %{version} -%endif %description devel HarfBuzz is an OpenType text shaping engine. @@ -96,43 +76,18 @@ %build %configure \ --disable-static \ -%if %{build_bootstrap} - --without-glib \ - --without-gobject \ - --without-freetype \ - --without-cairo \ - --without-icu \ - --without-graphite2 \ - --disable-instrospection -%else --with-glib \ --with-freetype \ --with-cairo \ --with-icu \ --with-graphite2 -%endif make %{?_smp_mflags} %install %make_install -%if %{build_bootstrap} - -install src/*.h %{buildroot}%{_includedir}/harfbuzz/ -install src/*.hh %{buildroot}%{_includedir}/harfbuzz/ -find %{buildroot}%{_includedir}/harfbuzz/ -type f | xargs chmod -x -rm -rf %{buildroot}%{_datadir}/gtk-doc - -%endif - find %{buildroot} -type f -name "*.la" -delete -print -%if %{build_bootstrap} -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%else %post -n libharfbuzz0 -p /sbin/ldconfig %post -n libharfbuzz-icu0 -p /sbin/ldconfig @@ -141,19 +96,11 @@ %postun -n libharfbuzz-icu0 -p /sbin/ldconfig -%endif - -%if %{build_bootstrap} -%files -%defattr(-,root,root) -%else %files -n libharfbuzz0 %defattr(-,root,root) -%endif %doc AUTHORS COPYING NEWS README THANKS %{_libdir}/libharfbuzz.so.0* -%if ! %{build_bootstrap} %files -n libharfbuzz-icu0 %defattr(-,root,root) %{_libdir}/libharfbuzz-icu.so.0* @@ -164,17 +111,13 @@ %{_bindir}/hb-shape %{_bindir}/hb-view -%endif - %files devel %defattr(-,root,root) %{_includedir}/harfbuzz/ %{_libdir}/*.so %{_libdir}/pkgconfig/harfbuzz.pc -%if ! %{build_bootstrap} %docdir %{_datadir}/gtk-doc %{_datadir}/gtk-doc/html/harfbuzz/ %{_libdir}/pkgconfig/harfbuzz-icu.pc -%endif %changelog
