diff --git a/baselibs.conf b/baselibs.conf index cedfe82..d938e88 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ libfdt1 -libfdt1-devel +libfdt-devel diff --git a/dtc.changes b/dtc.changes index 2ea433e..817aa9c 100644 --- a/dtc.changes +++ b/dtc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 5 10:22:44 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Dont include soname version in devel package name + ------------------------------------------------------------------- Mon Nov 9 17:28:39 UTC 2015 - p.drouand@gmail.com diff --git a/dtc.spec b/dtc.spec index 926babb..f503432 100644 --- a/dtc.spec +++ b/dtc.spec @@ -1,7 +1,7 @@ # # spec file for package dtc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,20 +16,21 @@ # +%define sover 1 Name: dtc -Url: http://devicetree.org/Device_Tree_Compiler Version: 1.4.1 Release: 0 -BuildRequires: bison -BuildRequires: flex Summary: Device-tree compiler License: GPL-2.0+ Group: Development/Tools/Building -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://devicetree.org/Device_Tree_Compiler Source: https://www.kernel.org/pub/software/utils/dtc/%{name}-%{version}.tar.xz Source2: baselibs.conf Patch3: dtc-license.patch Patch4: use-tx-as-the-type-specifier-instead-of-zx.patch +BuildRequires: bison +BuildRequires: flex +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description PowerPC kernels are moving towards requiring a small Open @@ -40,22 +41,22 @@ create a static device tree, which is adequate for most embedded systems (since their topology will not vary across reboots). DTC is available via a git tree: git://ozlabs.org/srv/projects/dtc/dtc.git -%package -n libfdt1 - +%package -n libfdt%{sover} Summary: Device tree library -Group: Development/Libraries/C and C++ +Group: Development/Libraries/C and C++ -%description -n libfdt1 +%description -n libfdt%{sover} libfdt is a library to process Open Firmware style device trees on various architectures. -%package -n libfdt1-devel - +%package -n libfdt-devel Summary: Development headers for device tree library Group: Development/Libraries/C and C++ -Requires: libfdt1 = %{version} +Requires: libfdt%{sover} = %{version}-%{release} +# Provde previously used incorrectly named devel package +Provides: libfdt%1-devel = %{version}-%{release} -%description -n libfdt1-devel +%description -n libfdt-devel This package provides development files for libfdt %prep @@ -67,8 +68,8 @@ This package provides development files for libfdt make %{?_smp_mflags} %install -%makeinstall PREFIX=/usr LIBDIR=%{_libdir} -install -m 644 libfdt/libfdt_env.h $RPM_BUILD_ROOT/%{_includedir} +make DESTDIR=%{buildroot} install %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir} +install -m 644 libfdt/libfdt_env.h %{buildroot}/%{_includedir} rm -f %{buildroot}/%{_libdir}/*.a %files @@ -81,13 +82,17 @@ rm -f %{buildroot}/%{_libdir}/*.a %{_bindir}/fdtget %{_bindir}/fdtput -%files -n libfdt1 +%post -n libfdt%{sover} -p /sbin/ldconfig + +%postun -n libfdt%{sover} -p /sbin/ldconfig + +%files -n libfdt%{sover} %defattr(-,root,root,-) %doc GPL %{_libdir}/libfdt-%{version}.so %{_libdir}/libfdt.so.* -%files -n libfdt1-devel +%files -n libfdt-devel %defattr(-,root,root,-) %{_libdir}/libfdt.so %{_includedir}/*