[Ayttm-commits] CVS: ayttm configure.in,1.156,1.157 ChangeLog,1.160,1.161 ayttm.spec.in,1.2,1.3

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm
In directory subversions:/tmp/cvs-serv28366

Modified Files:
        configure.in ChangeLog ayttm.spec.in 
Log Message:
fixed the spec file

Index: configure.in
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.in,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- configure.in        20 Jan 2003 06:06:22 -0000      1.156
+++ configure.in        20 Jan 2003 08:03:49 -0000      1.157
@@ -99,6 +99,8 @@
 [  --disable-esd           compile without ESD soundserver])
 
 dnl want crash dialog
+AC_SUBST(REQUIRES)
+REQUIRES=
 AC_ARG_ENABLE(crash-dialog,
        [  --disable-crash-dialog  Disable crash dialog],
        [enable_crash_dialog=$enableval], [enable_crash_dialog=yes])
@@ -108,6 +110,7 @@
        AC_MSG_CHECKING([whether to use crash dialog])
        if test "$enable_crash_dialog" != "no"; then
                AC_DEFINE(CRASH_DIALOG, 1, Pop up crash dialog)
+               REQUIRES="gdb"
        fi
        AC_MSG_RESULT($enable_crash_dialog)
 fi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog   20 Jan 2003 06:55:31 -0000      1.160
+++ ChangeLog   20 Jan 2003 08:03:49 -0000      1.161
@@ -1,3 +1,7 @@
+* Mon Jan 20 2003 08:00 GMT [philip]   0.2.1-5
+- Fixed the spec file - file paths are correct and gdb added to requires in 
+case the rpm is compiled with --enable-crash-dialog
+
 * Mon Jan 20 2003 06:52 GMT [philip]   0.2.1-5
 - Changed ChangeLog to use GMT only
 

Index: ayttm.spec.in
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ayttm.spec.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ayttm.spec.in       16 Jan 2003 20:03:16 -0000      1.2
+++ ayttm.spec.in       20 Jan 2003 08:03:49 -0000      1.3
@@ -6,7 +6,8 @@
 License:       GPL
 URL:           http://www.nongnu.org/ayttm/
 Source:        %{name}-%{version}.tar.gz
-Buildroot:     ${_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires:      @REQUIRES@
 
 %description
 Ayttm is designed to become a Universal Instant Messaging client, seamlessly
@@ -34,21 +35,21 @@
 # Install documentation.
 %doc COPYING AUTHORS README ChangeLog
 # Install man page.
-%{_prefix}/man/man1/ayttm.1*
+%{_mandir}/man*/*
 # Icons and sounds
-%{_prefix}/share/pixmaps/ebicon.png
-%{_prefix}/share/@PACKAGE@/sounds/*
+%{_datadir}/pixmaps/ayttm.png
+%{_datadir}/@PACKAGE@/sounds/*
 # Red Hat menu (doesn't do any damage on other distros)
-%{_prefix}/share/gnome/apps/Internet/@address@hidden
-%{_prefix}/share/applnk/Internet/@address@hidden
+%{_datadir}/gnome/apps/Internet/@address@hidden
+%{_datadir}/applnk/Internet/@address@hidden
 # Install the modules
-%{_prefix}/share/@PACKAGE@/modules/*.a   
-%{_prefix}/share/@PACKAGE@/modules/*.la  
-%{_prefix}/share/@PACKAGE@/modules/*.so 
+%{_datadir}/@PACKAGE@/modules/*.a   
+%{_datadir}/@PACKAGE@/modules/*.la  
+%{_datadir}/@PACKAGE@/modules/*.so 
 # Install translations
-%{_prefix}/share/locale/*/LC_MESSAGES/@address@hidden
+%{_datadir}/locale/*/LC_MESSAGES/@address@hidden
 # Lastly, the binary itself
-%{_prefix}/bin/@PACKAGE@
+%{_bindir}/@PACKAGE@
 
 %changelog
 @CHANGELOG@