rpms/lshw/devel lshw.consolehelper, NONE, 1.1 lshw.desktop, NONE, 1.1 lshw.pam, NONE, 1.1 lshw.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Terje Røsten (terjeros) fedora-extras-commits at redhat.com
Wed Aug 15 21:02:40 UTC 2007


Author: terjeros

Update of /cvs/extras/rpms/lshw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29400/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lshw.consolehelper lshw.desktop lshw.pam lshw.spec 
Log Message:
Importing new package: lshw.




--- NEW FILE lshw.consolehelper ---
USER=root
PROGRAM=/usr/sbin/lshw-gui
SESSION=true


--- NEW FILE lshw.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Hardware Lister
Comment=Browse hardware on host computer
Exec=/usr/bin/lshw-gui
Icon=lshw-logo.svg
Terminal=false
Type=Application
Categories=GTK;System;


--- NEW FILE lshw.pam ---
#%PAM-1.0                                                                      
auth            include         config-util
account         include         config-util
session         include         config-util


--- NEW FILE lshw.spec ---
Summary: Hardware lister
Name:    lshw
Version: B.02.11.01
Release: 3%{?dist}
License: GPLv2
Group:   Applications/System
URL:     http://ezix.org/project/wiki/HardwareLiSter
Source0: http://www.ezix.org/software/files/%{name}-%{version}.tar.gz
Source1: lshw.desktop
Source2: lshw.consolehelper
Source3: lshw.pam
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
lshw is a small tool to provide detailed informaton on the hardware
configuration of the machine. It can report exact memory configuration,
firmware version, mainboard configuration, CPU version and speed, cache
configuration, bus speed, etc. on DMI-capable x86 systems and on some
PowerPC machines (PowerMac G4 is known to work).

Information can be output in plain text, XML or HTML.

%package gui
Summary:  Graphical hardware lister
Group:    Applications/System
Requires: usermode
Requires: %{name} = %{version}-%{release}
BuildRequires: gtk2-devel >= 2.4
BuildRequires: desktop-file-utils

%description gui
Graphical frontend for the hardware lister (lshw) tool.
If desired, hardware information can be saved to file in
plain, XML or HTML format.

%prep
%setup -q -n %{name}-%{version}

%{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile
%{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile
%{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/gui/Makefile
%{__sed} -i 's|LDFLAGS= -Os -s|LDFLAGS=|' src/gui/Makefile

%build
%{__make} %{?_smp_mflags} SBINDIR="%{_sbindir}" gui 

%install
%{__rm} -rf %{buildroot}
%{__make} install              \
        DESTDIR="%{buildroot}" \
        PREFIX="%{_prefix}"    \
        SBINDIR="%{_sbindir}"  \
        MANDIR="%{_mandir}"    \
        INSTALL="%{__install} -p"

%{__make} install-gui          \
        DESTDIR="%{buildroot}" \
        PREFIX="%{_prefix}"    \
        SBINDIR="%{_sbindir}"  \
        MANDIR="%{_mandir}"    \
        INSTALL="%{__install} -p"

%{__ln_s} -f gtk-lshw %{buildroot}%{_sbindir}/lshw-gui

# desktop icon
%{__install} -D -m 0644 -p ./src/gui/artwork/logo.svg \
     %{buildroot}%{_datadir}/pixmaps/%{name}-logo.svg

desktop-file-install --vendor fedora  \
  --dir %{buildroot}%{_datadir}/applications %{SOURCE1}

# consolehelper
%{__install} -d %{buildroot}%{_bindir}
%{__ln_s} -f consolehelper %{buildroot}%{_bindir}/%{name}-gui
%{__install} -D -m 0644 %{SOURCE2} \
   %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-gui
%{__install} -D -m 0644 %{SOURCE3} \
   %{buildroot}%{_sysconfdir}/pam.d/%{name}-gui

# remove some trademarks
for f in powermacg5 intel powermac amd mini powerpc ; do
    %{__rm} -fv %{buildroot}%{_datadir}/%{name}/artwork/$f.svg
done

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc COPYING README docs/*
%doc %{_mandir}/man1/lshw.1*
%{_sbindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.txt
%{_datadir}/%{name}/*.ids

%files gui
%defattr(-, root, root, -)
%doc COPYING
%config(noreplace) %{_sysconfdir}/pam.d/%{name}-gui
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}-gui
%{_bindir}/%{name}-gui
%{_sbindir}/gtk-%{name}
%{_sbindir}/%{name}-gui
%{_datadir}/%{name}/artwork
%{_datadir}/pixmaps/%{name}-logo.svg
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Tue Aug 14 2007 Terje Rosten <terjeros at phys.ntnu.no> - B.02.11.01-3
- Move desktop and pam config to files
- Simplify build

* Tue Aug 07 2007 Terje Rosten <terjeros at phys.ntnu.no> - B.02.11.01-2
- Remove trademarks

* Mon Aug 06 2007 Terje Rosten <terjeros at phys.ntnu.no> - B.02.11.01-1
- B.02.11.01

* Sun Aug 05 2007 Terje Rosten <terjeros at phys.ntnu.no> - B.02.11-3
- Move artwork to gui subpackage
- Implement consolehelper support

* Sat Aug 04 2007 Terje Rosten <terjeros at phys.ntnu.no> - B.02.11-2
- License is GPLv2 (only)
- Fix ui %%description

* Wed Aug 01 2007 Terje Rosten <terjeros at phys.ntnu.no> - B.02.11-1
- Follow upstream version scheme

* Wed Jul 25 2007 Terje Rosten <terjeros at phys.ntnu.no> - 2.11-1
- 2.11

* Wed Jun 27 2007 Terje Rosten <terjeros at phys.ntnu.no> - 2.10-2
- minor fixes
- add patch to avoid stripping
- add desktop file
- strip changelog
- move from sbin to bin
- new url

* Wed Feb 14 2007 Dag Wieers <dag at wieers.com> - 2.10-1 - 4876+/dag
- Updated to release B.02.10.

* Tue Dec 21 2004 Dag Wieers <dag at wieers.com> - 2.0-1
- Initial package. (using DAR)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lshw/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Aug 2007 18:01:21 -0000	1.1
+++ .cvsignore	15 Aug 2007 21:02:06 -0000	1.2
@@ -0,0 +1 @@
+lshw-B.02.11.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lshw/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Aug 2007 18:01:21 -0000	1.1
+++ sources	15 Aug 2007 21:02:06 -0000	1.2
@@ -0,0 +1 @@
+23debbc3c0a719f301861cfc079b3f4b  lshw-B.02.11.01.tar.gz




More information about the fedora-extras-commits mailing list