rpms/kshutdown/FC-5 .cvsignore, 1.2, 1.3 kshutdown.spec, 1.1, 1.2 sources, 1.2, 1.3

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/kshutdown/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19365/FC-5

Modified Files:
	.cvsignore kshutdown.spec sources 
Log Message:
auto-import kshutdown-0.9.1beta-2 on branch FC-5 from kshutdown-0.9.1beta-2.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kshutdown/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2006 10:11:36 -0000	1.2
+++ .cvsignore	3 Feb 2007 12:47:53 -0000	1.3
@@ -1 +1 @@
-kshutdown-0.8.2.tar.bz2
+kshutdown-0.9.1beta.tar.bz2


Index: kshutdown.spec
===================================================================
RCS file: /cvs/extras/rpms/kshutdown/FC-5/kshutdown.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kshutdown.spec	10 Sep 2006 10:11:36 -0000	1.1
+++ kshutdown.spec	3 Feb 2007 12:47:53 -0000	1.2
@@ -1,12 +1,14 @@
 Name:           kshutdown
-Version:        0.8.2
-Release:        5%{?dist}
+Version:        0.9.1beta
+Release:        2%{?dist}
 Summary:        KShutDown is an advanced shut down utility for KDE
 
 Group:          Applications/System
 License:        GPL
+
 URL:            http://kshutdown.sourceforge.net/
 Source:         http://dl.sourceforge.net/sourceforge/kshutdown/kshutdown-%{version}.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils, kdelibs-devel
 
@@ -18,57 +20,77 @@
 
 %build
 %configure --disable-rpath
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-        --add-category Application                              \
-        --add-category Utility                                  \
-        --add-category KDE                                      \
-        --add-category Qt                                       \
-        --delete-original                                       \
-    ${RPM_BUILD_ROOT}%{_datadir}/applications/kshutdown.desktop
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
 
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/??/%{name}/common
-rm -f $RPM_BUILD_ROOT%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory
-
-%find_lang %{name}
+desktop-file-install --vendor ""                            \
+        --dir %{buildroot}%{_datadir}/applications          \
+        --add-category Utility                              \
+        --delete-original                                   \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+
+%{__rm} -f %{buildroot}%{_datadir}/apps/%{name}/extras/{multimedia,system,shutdown}/.directory
+
+## File lists
+# locale's
+%find_lang %{name} || touch %{name}.lang
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
+done
+fi
 
 %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 || :
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO VERSION
 
-%{_bindir}/kshutdown
-%exclude %{_libdir}/kde3/kshutdownlockout_panelapplet.la
-%{_libdir}/kde3/kshutdownlockout_panelapplet.so
-%{_datadir}/applications/fedora-kshutdown.desktop
-%{_datadir}/apps/kshutdown
+%{_bindir}/%{name}
+%{_libdir}/kde3/%{name}lockout_panelapplet.la
+%{_libdir}/kde3/%{name}lockout_panelapplet.so
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/apps/%{name}
 %{_datadir}/apps/kconf_update/kshutdown.upd
-%{_datadir}/apps/kicker/applets/kshutdownlockout.desktop
-%{_datadir}/icons/hicolor/??x??/apps/kshutdown.png
-%{_datadir}/doc/HTML/??/kshutdown
+%{_datadir}/apps/kicker/applets/%{name}lockout.desktop
+%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
+
 
 %Changelog
+* Sat Feb 03 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> 0.9.1beta-2
+- bug fix #224430
+
+* Wed Jan 10 2007 Chitlesh Goorah <chitlesh at fedoraproject.org> 0.9.1beta-1
+- New upstream development release 0.9.1beta
+- Dropped fedora vendor
+- Minor fixes in the spec files
+- Fixed absolute paths
+
 * Sun Sep 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 0.8.2-5
 - Added %%{?dist}
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kshutdown/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2006 10:11:36 -0000	1.2
+++ sources	3 Feb 2007 12:47:53 -0000	1.3
@@ -1 +1 @@
-6acd45acc5c0669b0973f0246e4bcca7  kshutdown-0.8.2.tar.bz2
+44bd0ff7c6fae44eb24831ebf8446954  kshutdown-0.9.1beta.tar.bz2