- Small spec file cleanup
- Do not ship pci/usb/oter id's as they are provided by other packages as well * a French localization was added OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=10
This commit is contained in:
committed by
Git OBS Bridge
parent
7e30879dc6
commit
75ec212cdf
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 11:25:53 UTC 2016 - mpluskal@suse.com
|
||||
|
||||
- Small spec file cleanup
|
||||
- Do not ship pci/usb/oter id's as they are provided by other
|
||||
packages as well
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 26 19:39:38 UTC 2016 - mpluskal@suse.com
|
||||
|
||||
@@ -45,7 +52,7 @@ Wed Oct 6 08:08:03 UTC 2010 - pascal.bleser@opensuse.org
|
||||
|
||||
- update to B.02.15:
|
||||
* adds experimental support for dumping information into an SQLite database
|
||||
* a French localization was added
|
||||
* a French localization was added
|
||||
* a number of bugs were fixed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
53
lshw.spec
53
lshw.spec
@@ -30,7 +30,7 @@ Source2: lshw.png
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(gail) >= 2.4.0
|
||||
BuildRequires: pkgconfig(gdk-2.0) >= 2.4.0
|
||||
@@ -88,30 +88,30 @@ http://www.ezix.org/software/lshw.html
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} \
|
||||
PREFIX="%{_prefix}" \
|
||||
SBINDIR="%{_sbindir}" \
|
||||
MANDIR="%{_mandir}" \
|
||||
DATADIR="%{_datadir}" \
|
||||
CXX="g++" \
|
||||
CC="gcc" \
|
||||
RPM_OPT_FLAGS="%{optflags}" \
|
||||
STRIP=touch \
|
||||
all \
|
||||
gui
|
||||
make \
|
||||
%{?_smp_mflags} \
|
||||
PREFIX="%{_prefix}" \
|
||||
SBINDIR="%{_sbindir}" \
|
||||
MANDIR="%{_mandir}" \
|
||||
DATADIR="%{_datadir}" \
|
||||
CXX="g++" \
|
||||
CC="gcc" \
|
||||
RPM_OPT_FLAGS="%{optflags}" \
|
||||
STRIP=touch \
|
||||
all gui
|
||||
|
||||
%install
|
||||
make %{?_smp_mflags} \
|
||||
DESTDIR=%{buildroot} \
|
||||
PREFIX="%{_prefix}" \
|
||||
SBINDIR="%{_sbindir}" \
|
||||
MANDIR="%{_mandir}" \
|
||||
DATADIR="%{_datadir}" \
|
||||
CXX="g++" \
|
||||
CC="gcc" \
|
||||
OPTFLAGS="%{optflags}" \
|
||||
install \
|
||||
install-gui
|
||||
make \
|
||||
%{?_smp_mflags} \
|
||||
DESTDIR=%{buildroot} \
|
||||
PREFIX="%{_prefix}" \
|
||||
SBINDIR="%{_sbindir}" \
|
||||
MANDIR="%{_mandir}" \
|
||||
DATADIR="%{_datadir}" \
|
||||
CXX="g++" \
|
||||
CC="gcc" \
|
||||
OPTFLAGS="%{optflags}" \
|
||||
install install-gui
|
||||
|
||||
install -d "%{buildroot}%{_datadir}/applications"
|
||||
sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \
|
||||
@@ -120,6 +120,11 @@ chmod 0644 "%{buildroot}%{_datadir}/applications/%{name}.desktop"
|
||||
install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
|
||||
|
||||
%suse_update_desktop_file -r "%{name}" System HardwareSettings
|
||||
# All of following are shipped by other packages as well
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/pci.ids
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/usb.ids
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/oui.txt
|
||||
rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt
|
||||
|
||||
%find_lang lshw
|
||||
|
||||
@@ -136,8 +141,6 @@ install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png"
|
||||
%doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd
|
||||
%attr(0755,root,root) %{_sbindir}/lshw
|
||||
%dir %{_datadir}/lshw
|
||||
%{_datadir}/lshw/*.txt
|
||||
%{_datadir}/lshw/*.ids
|
||||
%{_mandir}/man1/lshw.1%{ext_man}
|
||||
|
||||
%files gui
|
||||
|
Reference in New Issue
Block a user