From 7d18e2c1a5960c62e86a3591992ce68e0ae281c4 Mon Sep 17 00:00:00 2001 From: alphastar868 Date: Sun, 13 Nov 2016 18:57:05 -0500 Subject: [PATCH 1/2] Update i-nex.spec Updated to 7.6.0, removed obsolete dependencies --- dists/redhat/i-nex.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dists/redhat/i-nex.spec b/dists/redhat/i-nex.spec index ef7f9f5..0e9e58d 100644 --- a/dists/redhat/i-nex.spec +++ b/dists/redhat/i-nex.spec @@ -3,13 +3,13 @@ # The gittag version below ensures that the source tag points to the latest commit in GitHub e.g. latest commit as of 14 Aug 2016 is f57f4a5 -%define gittag c2ef2ea -%define gitlong c2ef2ea4e32fea06258d7f15e7cce3eb41aef374 -%define gitdate 20161003 +%define gittag 6832317 +%define gitlong 6832317eb859d9d557597cddbb51091ccdec0039 +%define gitdate 20161112 Name: i-nex -Version: 7.4.0.1 -Release: %{gitdate}.bzr933.git%{?gittag}%{?dist} +Version: 7.6.0 +Release: %{gitdate}.git%{?gittag}%{?dist} Summary: System information tool License: GPL-3.0+ @@ -36,7 +36,7 @@ BuildRequires: gambas3-gb-settings >= 3.8.4 BuildRequires: hicolor-icon-theme BuildRequires: net-tools BuildRequires: pkgconfig -BuildRequires: pkgconfig(libcpuid) >= 0.3.0 +BuildRequires: pkgconfig(libcpuid) >= 0.4.0 BuildRequires: pkgconfig(libprocps) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(gl) @@ -58,9 +58,7 @@ Requires: gambas3-gb-qt5-opengl >= 3.8.4 Requires: gambas3-gb-qt5-webkit >= 3.8.4 Requires: gambas3-gb-settings >= 3.8.4 Requires: gambas3-runtime >= 3.8.4 -Requires: i2c-tools Requires: procps-ng -Requires: glx-utils %description An application that gathers information for hardware @@ -120,10 +118,10 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %files %defattr(-,root,root,-) -%doc debian/copyright docs/I-Nex.LICENSE I-Nex/COPYING +%doc debian/copyright I-Nex/ChangeLog I-Nex/COPYING +%doc I-Nex/INSTALL I-Nex/NEWS I-Nex/README %{_bindir}/%{name}-* %doc %{_mandir}/man*/%{name}* -/usr/share/i-nex/pastebinit %files data %defattr(-,root,root,-) @@ -131,9 +129,8 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_bindir}/%{name}.gambas %{_datadir}/applications/%{name}*.desktop %{_datadir}/pixmaps/%{name}* -%doc debian/changelog* changelogs/changelog* -%doc I-Nex/AUTHORS I-Nex/ChangeLog I-Nex/README -/lib/udev/rules.d/i2c_smbus.rules +%doc debian/changelog* I-Nex/ChangeLog +%doc I-Nex/AUTHORS I-Nex/COPYING I-Nex/NEWS I-Nex/README %changelog * Wed Aug 17 2016 From fea0b313c9ebf1e66772ae7e332b172a5142b423 Mon Sep 17 00:00:00 2001 From: alphastar868 Date: Sun, 13 Nov 2016 19:06:35 -0500 Subject: [PATCH 2/2] Create libcpuid.spec SPEC file for libcpuid14 (commit 4c776cb/3Oct2016 and higher) --- dists/redhat/libcpuid.spec | 82 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 dists/redhat/libcpuid.spec diff --git a/dists/redhat/libcpuid.spec b/dists/redhat/libcpuid.spec new file mode 100644 index 0000000..43ec0e8 --- /dev/null +++ b/dists/redhat/libcpuid.spec @@ -0,0 +1,82 @@ + +%define gittag fa87a5e +%define gitlong fa87a5e183a3809ded89ecb3efde4e94837c5736 +%define gitdate 20161112 + +Name: libcpuid +Version: 0.4.0 +Release: %{gitdate}+git%{?gittag}%{?dist} +Summary: Provides CPU identification for x86 +License: BSD-2-Clause +Group: Development/Libraries/C and C++ +Url: https://github.com/anrieff/libcpuid +Source0: https://www.github.com/anrieff/libcpuid/archive/%{gittag}.zip#/libcpuid-%{gitlong}.zip + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Libcpuid provides CPU identification for the x86 (and x86_64). + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. +For details about the programming API, please see the docs +on the project's site (http://libcpuid.sourceforge.net/) + + +%package -n %{name}14 +Summary: Provides CPU identification for x86 +Group: Development/Libraries/C and C++ + +%description -n %{name}14 +Libcpuid provides CPU identification for the x86 (and x86_64). + + +%prep +%setup -q -n libcpuid-%{gitlong} + + +%build +libtoolize +autoreconf --install +%configure +make V=1 %{?_smp_mflags} + + +%install +make V=1 DESTDIR=%{buildroot} install +# WARNING: empty dependency_libs variable. remove the pointless .la +rm %{buildroot}%{_libdir}/*.la + + +%post -n %{name}14 -p /sbin/ldconfig + +%postun -n %{name}14 -p /sbin/ldconfig + + +%files -n %{name}14 +%defattr(-,root,root) +%{_libdir}/%{name}.so.* +%doc %{_mandir}/man*/*cpu* + +%files devel +%defattr(-,root,root) +%{_bindir}/cpuid_tool +%{_includedir}/%{name} +%{_libdir}/%{name}* +%exclude %{_libdir}/%{name}.so.* +%{_libdir}/pkgconfig/%{name}.pc + +%changelog + +