kadischi Makefile.am, 1.4, 1.5 configure.ac, 1.5, 1.6 kadischi.spec, 1.25, 1.26

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	Makefile.am configure.ac kadischi.spec 
Log Message:
Make sure we install everything properly when doing an RPM build or source installation, move desktop-file-install to %%post


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	13 Apr 2006 09:45:45 -0000	1.4
+++ Makefile.am	9 Jul 2006 00:46:55 -0000	1.5
@@ -12,7 +12,8 @@
 	rc			\
 	scanswap                \
         bootsplash              \
-        man
+        man                     \
+        desktop
 
 EXTRA_DIST = \
 	pycheckrc				\


Index: configure.ac
===================================================================
RCS file: /cvs/devel/kadischi/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac	13 Apr 2006 09:45:45 -0000	1.5
+++ configure.ac	9 Jul 2006 00:46:55 -0000	1.6
@@ -59,4 +59,5 @@
 scanswap/Makefile
 bootsplash/Makefile
 man/Makefile
+desktop/Makefile
 ])


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kadischi.spec	5 Jul 2006 13:36:23 -0000	1.25
+++ kadischi.spec	9 Jul 2006 00:46:55 -0000	1.26
@@ -37,12 +37,13 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
+%post
 desktop-file-install --vendor fedora \
     --add-category X-Fedora \
     --add-category Network \
     --delete-original \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-    $RPM_BUILD_ROOT/%{_datadir}/%{name}/%{name}.desktop
+    --dir %{_datadir}/applications/ \
+    %{_datadir}/%{name}/desktop/%{name}.desktop
 
 
 %clean
@@ -72,12 +73,13 @@
 %{_datadir}/%{name}/install/rc.readonly-livecd
 %{_datadir}/%{name}/install/readonly-halt
 %{_datadir}/%{name}/install/userhome.sh
-%{_datadir}/%{name}/install/userhome.desktop
+%{_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/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man5/%{name}.conf.5.gz
 %ghost %{_datadir}/%{name}/*.pyc
@@ -88,6 +90,12 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Sat Jul 8 2006 <jasperhartline at adelphia.net> 2.4-5.20060708cvs
+- Make sure files are being installed whether we're making, or doing an 
+  rpmbuild.
+- Minor changes to userhome.sh
+
+
 * Thu Jul 6 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 2.4-4.20060706cvs
 - added kadischigui.py and fedora-kadischi.desktop