rpms/kdirstat/devel kdirstat.spec,1.1,1.2 needs.rebuild,1.1,NONE

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	kdirstat.spec 
Removed Files:
	needs.rebuild 
Log Message:
auto-import kdirstat-2.5.3-4 on branch devel from kdirstat-2.5.3-4.src.rpm


Index: kdirstat.spec
===================================================================
RCS file: /cvs/extras/rpms/kdirstat/devel/kdirstat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdirstat.spec	30 Jun 2006 07:28:55 -0000	1.1
+++ kdirstat.spec	4 Sep 2006 22:32:35 -0000	1.2
@@ -1,17 +1,17 @@
-Name:		kdirstat
-Version:	2.5.3
-Release:	3%{?dist}
-Summary:	Graphical Directory Statistics for Used Disk Space
-
-License:	GPL
-Group:		Applications/System
-URL:		http://kdirstat.sourceforge.net
+Name:             kdirstat
+Version:          2.5.3
+Release:          4%{?dist}
+Summary:          Graphical Directory Statistics for Used Disk Space
+
+License:          GPL/LGPL
+Group:            Applications/System
+URL:              http://kdirstat.sourceforge.net
 
-Source0:	http://kdirstat.sourceforge.net/download/%{name}-%{version}.tar.bz2
-Patch0:		kdirstat-2.5.3-desktop.patch
+Source0:          http://kdirstat.sourceforge.net/download/%{name}-%{version}.tar.bz2
+Patch0:           kdirstat-2.5.3-desktop.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	  kdelibs-devel, desktop-file-utils
+BuildRequires:    kdelibs-devel, desktop-file-utils
 
 %description
 KDirStat (KDE Directory Statistics) is a utility program that sums up
@@ -21,42 +21,42 @@
 %prep
 %setup -q
 
-%patch0 -p0 -b .
+%patch0 -p0 -b kdirstat.desktop
 
 %build
 %configure --disable-final --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} install
+
 # Fix absolute symlink
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
-ln -s ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/%{name}/common
+%{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
+ln -s ../common %{buildroot}%{_docdir}/HTML/en/%{name}/common
+
+%{__mkdir} -p %{buildroot}%{_docdir}/%{name}-%{version}
+%{__cp} -pr %{buildroot}%{_docdir}/HTML/*/%{name}/* %{buildroot}%{_docdir}/%{name}-%{version}
 
 desktop-file-install --vendor fedora \
     --add-category X-Fedora \
     --add-category System \
     --delete-original \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-    $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
+    --dir %{buildroot}%{_datadir}/applications/ \
+    %{buildroot}%{_datadir}/applnk/Utilities/%{name}.desktop
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -65,11 +65,15 @@
 %{_bindir}/%{name}-cache-writer
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
-%{_datadir}/apps/kconf_update/*
+%{_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
+%{_datadir}/apps/kconf_update/%{name}.upd
 %{_datadir}/icons/??color/??x??/
 %{_docdir}/HTML/*/%{name}/
 
-%changelog
+%Changelog
+* Sat Sep 02 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 2.5.3-4
+- Rebuild for FC-6 devel
+
 * Thu Jun 29 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> - 2.5.3-3
 - fixed owner of fix_move_to_trash_bin.pl kdirstat.upd in kconf_update
 


--- needs.rebuild DELETED ---