rpms/ksensors/F-7 .cvsignore, 1.5, 1.6 ksensors-0.7.3-po.patch, 1.1, 1.2 ksensors-desktop.patch, 1.2, 1.3 ksensors.spec, 1.13, 1.14 sources, 1.5, 1.6 ksensors-hddtemp-detect.patch, 1.2, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Jul 27 22:06:10 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/ksensors/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31576
Modified Files:
.cvsignore ksensors-0.7.3-po.patch ksensors-desktop.patch
ksensors.spec sources
Removed Files:
ksensors-hddtemp-detect.patch
Log Message:
* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.3-10
- Add icon-cache update scriptlets
- Add Requires: hicolor-icon-theme for dir ownership
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ksensors/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 1 Oct 2006 14:39:03 -0000 1.5
+++ .cvsignore 27 Jul 2007 22:05:37 -0000 1.6
@@ -1,2 +1,2 @@
ksensors-0.7.3.tar.gz
-ksensors_0.7.3-11.diff.gz
+ksensors_0.7.3-14.diff.gz
ksensors-0.7.3-po.patch:
Index: ksensors-0.7.3-po.patch
===================================================================
RCS file: /cvs/extras/rpms/ksensors/F-7/ksensors-0.7.3-po.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ksensors-0.7.3-po.patch 1 Oct 2006 14:39:03 -0000 1.1
+++ ksensors-0.7.3-po.patch 27 Jul 2007 22:05:37 -0000 1.2
@@ -1,23 +1,26 @@
--- ksensors-0.7.3/po/Makefile.in~ 2004-08-19 00:39:08.000000000 +0300
-+++ ksensors-0.7.3/po/Makefile.in 2006-10-01 00:08:46.000000000 +0300
-@@ -255,8 +255,8 @@
++++ ksensors-0.7.3/po/Makefile.in 2007-06-26 22:05:56.000000000 +0300
+@@ -255,8 +255,8 @@ xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
#>- POFILES = AUTO
#>+ 2
-POFILES = nl.po fr.po es.po de.po cs.po
-GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo
-+POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po
-+GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo
++POFILES = nl.po fr.po es.po de.po cs.po it.po pl.po sv.po nb.po
++GMOFILES = nl.gmo fr.gmo es.gmo de.gmo cs.gmo it.gmo pl.gmo sv.gmo nb.gmo
subdir = po
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
-@@ -431,6 +431,15 @@
+@@ -431,6 +431,18 @@ de.gmo: de.po
cs.gmo: cs.po
rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
test ! -f cs.gmo || touch cs.gmo
+it.gmo: it.po
+ rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
+ test ! -f it.gmo || touch it.gmo
++nb.gmo: nb.po
++ rm -f nb.gmo; $(GMSGFMT) -o nb.gmo $(srcdir)/nb.po
++ test ! -f nb.gmo || touch nb.gmo
+pl.gmo: pl.po
+ rm -f pl.gmo; $(GMSGFMT) -o pl.gmo $(srcdir)/pl.po
+ test ! -f pl.gmo || touch pl.gmo
@@ -27,12 +30,12 @@
#>+ 3
clean-nls:
-@@ -438,7 +447,7 @@
+@@ -438,7 +450,7 @@ clean-nls:
#>+ 10
install-nls:
- @for base in nl fr es de cs ; do \
-+ @for base in nl fr es de cs it pl sv ; do \
++ @for base in nl fr es de cs it pl sv nb ; do \
echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
$(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
ksensors-desktop.patch:
Index: ksensors-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/ksensors/F-7/ksensors-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ksensors-desktop.patch 8 Nov 2004 04:41:36 -0000 1.2
+++ ksensors-desktop.patch 27 Jul 2007 22:05:37 -0000 1.3
@@ -1,11 +1,12 @@
--- src/ksensors.desktop~ 2003-12-27 23:48:03.000000000 +0200
-+++ src/ksensors.desktop 2004-08-21 01:44:04.991172639 +0300
-@@ -1,24 +1,9 @@
++++ src/ksensors.desktop 2007-06-26 22:06:51.000000000 +0300
+@@ -1,24 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
-Name=ksensors
-Name[xx]=xxksensorsxx
+Name=KSensors
++GenericName=Hardware Monitor
Exec=ksensors
Icon=ksensors
Type=Application
@@ -28,4 +29,6 @@
-Comment[xx]=xxA simple KDE Applicationxx
+Comment=Monitor system hardware sensors
+OnlyShowIn=KDE;
-+Categories=Application;Applet;System;Monitor;KDE;
++Categories=Applet;System;Monitor;KDE;
++X-KDE-autostart-after=panel
++X-KDE-autostart-condition=ksensorsrc:General:AutoStart:true
Index: ksensors.spec
===================================================================
RCS file: /cvs/extras/rpms/ksensors/F-7/ksensors.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ksensors.spec 1 Oct 2006 14:39:03 -0000 1.13
+++ ksensors.spec 27 Jul 2007 22:05:37 -0000 1.14
@@ -1,24 +1,24 @@
Name: ksensors
Version: 0.7.3
-Release: 7%{?dist}
+Release: 10%{?dist}
Summary: KDE frontend to lm_sensors
Group: Applications/System
License: GPL
URL: http://ksensors.sourceforge.net/
-Source0: http://download.sf.net/ksensors/%{name}-%{version}.tar.gz
-Patch0: %{name}-hddtemp-detect.patch
+Source0: http://downloads.sourceforge.net/ksensors/%{name}-%{version}.tar.gz
Patch1: %{name}-desktop.patch
-Patch2: http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-11.diff.gz
+Patch2: http://ftp.debian.org/debian/pool/main/k/ksensors/ksensors_0.7.3-14.diff.gz
Patch3: %{name}-0.7.3-po.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# lm_sensors available for these only; report a bug if something's missing
-ExclusiveArch: %{ix86} x86_64 alpha
+# Keep archs in sync with lm_sensors
+ExcludeArch: s390 s390x
BuildRequires: kdelibs-devel
BuildRequires: lm_sensors-devel
BuildRequires: gettext
BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
%description
KSensors is a nice lm-sensors frontend for the K Desktop Environment.
@@ -28,11 +28,13 @@
%prep
%setup -q
-%patch0 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p1
-%{__perl} -pi -e 's/\$\(kde_datadir\)/\$(datadir)/' src/sounds/Makefile.*
+sed -i -e 's|$(kde_datadir)/sounds|$(kde_sounddir)|' src/sounds/Makefile.*
+for f in ChangeLog LIESMICH LISEZMOI ; do
+ iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
%build
@@ -44,13 +46,12 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install \
- --vendor fedora \
- --mode 644 \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category X-Fedora \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+desktop-file-install --vendor fedora --mode 644 --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/ksensors.desktop
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/autostart
+ln -s ../applications/fedora-ksensors.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/autostart
rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML
%find_lang %{name}
@@ -59,21 +60,49 @@
rm -rf $RPM_BUILD_ROOT
+%post
+for f in locolor hicolor ; do
+ touch --no-create %{_datadir}/icons/$f 2> /dev/null || :
+ gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null || :
+done
+
+%postun
+for f in locolor hicolor ; do
+ touch --no-create %{_datadir}/icons/$f 2> /dev/null || :
+ gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null || :
+done
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING FAQ README TODO
%lang(es) %doc LEEME
%lang(de) %doc LIESMICH
%lang(fr) %doc LISEZMOI
-%{_bindir}/%{name}
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/apps/%{name}/
-%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+%{_bindir}/ksensors
+%{_datadir}/applications/*ksensors.desktop
+%{_datadir}/apps/ksensors/
+%{_datadir}/autostart/*ksensors.desktop
+%{_datadir}/icons/hicolor/*x*/apps/ksensors.png
%{_datadir}/icons/locolor/
-%{_datadir}/sounds/%{name}_alert.wav
+%{_datadir}/sounds/ksensors_alert.wav
%changelog
+* Fri Jul 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.3-10
+- Add icon-cache update scriptlets
+- Add Requires: hicolor-icon-theme for dir ownership
+
+* Fri Jul 20 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-9
+- Sync Exclu(de|sive)Arch with new lm_sensors (#249060).
+
+* Tue Jun 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-8
+- Update Debian patchset to -14 for additional fixes and translations;
+ drop our hddtemp detection patch in favour of the one included in it.
+- Drop Application and X-Fedora categories from .desktop file, add GenericName.
+- Make autostart checkbox effective again (#242570).
+- Convert docs to UTF-8.
+
* Sat Sep 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-7
- Apply Debian -11 patchset for upstream radio button state fix,
support for hddtemp with SCSI disks and more translations.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ksensors/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 1 Oct 2006 14:39:03 -0000 1.5
+++ sources 27 Jul 2007 22:05:37 -0000 1.6
@@ -1,2 +1,2 @@
4f6c5d7dea5e637e772d17f1e547d6f1 ksensors-0.7.3.tar.gz
-b6b26cf4fb7c75a777139291440ad6fa ksensors_0.7.3-11.diff.gz
+099443dbe659ce56ff69f67d8d721c00 ksensors_0.7.3-14.diff.gz
--- ksensors-hddtemp-detect.patch DELETED ---
More information about the scm-commits
mailing list