I have made the following changes intended for : CE:Adaptation:N950-N9 / libcal-rm-680-bin
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7561 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7561: Messages from BOSS: State: review at 2012-12-18T19:53:23 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Adaptation:N950-N9 / libcal-rm-680-bin -> CE:Adaptation:N950-N9 / libcal-rm-680-bin changes files: -------------- --- libcal-rm-680-bin.changes +++ libcal-rm-680-bin.changes @@ -0,0 +1,4 @@ +* Tue Dec 18 2012 Marko Saukko <[email protected]> - 0.4.3 +- Fix build with armv7hl compliant architectures +- Move libraries to %{_libdir} + @@ -2 +6,2 @@ -- Initial binary release for N950. \ No newline at end of file +- Initial binary release for N950. + spec files: ----------- --- libcal-rm-680-bin.spec +++ libcal-rm-680-bin.spec @@ -1,34 +1,34 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.25 # + +Name: libcal-rm-680-bin + # >> macros %define binary_release 2.1 %define debug_package %{nil} # << macros -Name: libcal-rm-680-bin Summary: Programming interface to Nokia internet tablet calibration data Version: 0.4.3 Release: 0 Group: System/Libraries License: Nokia Proprietary -ExclusiveArch: %{arm} +ExclusiveArch: armv7hl armv7nhl armv7thl armv7tnhl armv8el Source0: %{name}-%{version}-%{binary_release}-armv7hl.tar.bz2 Source1: license.txt Source100: libcal-rm-680-bin.yaml Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig - %description Libcal provides an api to read and modify the calibration data area on Nokia internet tablets. - %prep -%setup -q -n %{name}-%{version}-%{binary_release}-%{_target_cpu} +%setup -q -n %{name}-%{version}-%{binary_release}-armv7hl # >> setup cp %{SOURCE1} . @@ -42,29 +42,26 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre -mkdir -p %{buildroot}/lib +mkdir -p %{buildroot}%{_libdir} -cp -r ./lib/* %{buildroot}/lib +cp -r ./lib/* %{buildroot}%{_libdir} # << install pre # >> install post # << install post - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) -/lib/*.so.* -# >> files +%{_libdir}/*.so.* %doc license.txt +# >> files # << files - - other changes: -------------- ++++++ libcal-rm-680-bin.yaml --- libcal-rm-680-bin.yaml +++ libcal-rm-680-bin.yaml @@ -12,8 +12,9 @@ Configure: none Builder: none -ExclusiveArch: "%{arm}" -SetupOptions: -q -n %{name}-%{version}-%{binary_release}-%{_target_cpu} +ExclusiveArch: "armv7hl armv7nhl armv7thl armv7tnhl armv8el" +SetupOptions: -q -n %{name}-%{version}-%{binary_release}-armv7hl Files: - - "/lib/*.so.*" \ No newline at end of file + - "%{_libdir}/*.so.*" + - "%doc license.txt"
