kadischi kadischi.spec,1.28,1.29

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22831

Modified Files:
	kadischi.spec 
Log Message:
added kadischi.pam and kadischi.apps


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kadischi.spec	10 Jul 2006 11:49:56 -0000	1.28
+++ kadischi.spec	10 Jul 2006 15:47:11 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        2.5
-Release:        1.%{alphatag}
+Release:        3.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -37,19 +37,16 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-%post
 desktop-file-install --vendor fedora \
     --add-category X-Fedora \
-    --add-category Network \
+    --add-category System \
     --delete-original \
-    --dir %{_datadir}/applications/ \
-    %{_datadir}/%{name}/desktop/%{name}.desktop
-
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
 %doc FAQ README TODO COPYING CREDITS
@@ -58,15 +55,16 @@
 %dir %{_libexecdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/buildstamp
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
 %{_bindir}/%{name}
+%{_sbindir}/%{name}
 %{_datadir}/%{name}/*.sh
 %{_datadir}/%{name}/*.py
 %{_datadir}/%{name}/lib/*.py
 %{_datadir}/%{name}/post_install_scripts/*.sh
 %{_datadir}/%{name}/post_install_scripts/*.py
 %{_datadir}/%{name}/post_install_scripts/*.pl
-%{_libexecdir}/%{name}/find-live-cd
-%{_libexecdir}/%{name}/eject-live-cd
 %{_datadir}/%{name}/initrd/livecd-linuxrc
 %{_datadir}/%{name}/ks_examples/*.cfg
 %{_datadir}/%{name}/patches/*.patch
@@ -75,12 +73,13 @@
 %{_datadir}/%{name}/install/readonly-halt
 %{_datadir}/%{name}/install/userhome.sh
 %{_datadir}/%{name}/desktop/userhome.desktop
-%{_datadir}/%{name}/desktop/kadischi.desktop
-%{_libexecdir}/%{name}/scanswap
 %{_datadir}/%{name}/bootsplash/*.msg
 %{_datadir}/%{name}/bootsplash/splash.lss
 %{_datadir}/%{name}/bootsplash/memtest
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_libexecdir}/%{name}/eject-live-cd
+%{_libexecdir}/%{name}/find-live-cd
+%{_libexecdir}/%{name}/scanswap
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man5/%{name}.conf.5.gz
 %ghost %{_datadir}/%{name}/*.pyc
@@ -91,7 +90,12 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
-* Sat Jul 8 2006 <jasperhartline at adelphia.net> 2.5-1.20060710cvs
+* Mon Jul 10 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 2.5-3.20060710cvs
+- Removed desktop-file-install from %%post to %%install
+- added files kadischi.pam and kadischi.apps and minor Makefile.am fixes
+
+
+* Mon Jul 10 2006 <jasperhartline at adelphia.net> 2.5-2.20060710cvs
 - Add modified eject.c as eject_live_cd.c to eject our LiveCD