[Morse2txt-checkins] morse2txt morse2txt.spec.in,1.14,1.15

[Ken P. <kp...@us...>]

Update of /cvsroot/morse2txt/morse2txt
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14182

Modified Files:
	morse2txt.spec.in 
Log Message:
working, but problem with build.
removed commented out build lines.

Index: morse2txt.spec.in
===================================================================
RCS file: /cvsroot/morse2txt/morse2txt/morse2txt.spec.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** morse2txt.spec.in	1 Jun 2009 22:41:32 -0000	1.14
--- morse2txt.spec.in	2 Jun 2009 00:20:45 -0000	1.15
***************
*** 1,17 ****
! # Note that this is NOT a relocatable package
! %define ver @VERSION@
  %define  RELEASE 1.fc8
! %define  rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
! %define prefix /usr
  
  Summary: Morse Code Reader
! Name: morse2txt
! Version: %ver
! Release: %rel
  License: GPL
  Group: Applications/Communications
! Source: morse2txt-%{ver}.tar.gz
! BuildRoot: /var/tmp/morse2txt-%{PACKAGE_VERSION}-root
! #BuildRequires:  scrollkeeper >= %skreq
  
  URL: http://sourceforge.net/projects/morse2txt/
--- 1,15 ----
! %define name morse2txt
! %define version @VERSION@
  %define  RELEASE 1.fc8
! %define  release %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
  
  Summary: Morse Code Reader
! Name: %{name}
! Version: %{version}
! Release: %{release}
  License: GPL
  Group: Applications/Communications
! Source: morse2txt-%{version}.tar.gz
! BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-buildroot
  
  URL: http://sourceforge.net/projects/morse2txt/
***************
*** 28,42 ****
  
  %build
! %configure 
! make
  
  %install
  rm -rf $RPM_BUILD_ROOT
! 
! #export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
! %makeinstall
! #unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
! #rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper/
  %find_lang %{name}
  %clean
  rm -rf $RPM_BUILD_ROOT
--- 26,37 ----
  
  %build
! %configure --program-prefix=""
! make CFLAGS="$RPM_OPT_FLAGS"
  
  %install
  rm -rf $RPM_BUILD_ROOT
! make DESTDIR=$RPM_BUILD_ROOT install
  %find_lang %{name}
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT
***************
*** 46,72 ****
  %doc AUTHORS COPYING ChangeLog INSTALL NEWS README
  %attr(755,root,root) %{_bindir}/%{name}
- 
- #%{_bindir}/%{name}
- #%{_datadir}/omf/%{name}
- #%{_datadir}/gnome/help/%{name}
- #%{_sysconfdir}/gconf/schemas/%{name}.schemas
  %{_datadir}/applications/%{name}.desktop
  %{_datadir}/pixmaps/*
  
  %post
- #if which scrollkeeper-update >/dev/null 2>&1; then
- #        echo "Doing scrollkeeper update."
- #        scrollkeeper-update -q -o %{_datadir}/omf/%{name}
- #fi
- #if which gconftool-2 >/dev/null 2>&1; then
- #        echo "Installing gconf schema."
- #        export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- #        gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >
- #fi
  
  %postun
- #if which scrollkeeper-update >/dev/null 2>&1; then
- #        scrollkeeper-update -q
- #fi
  
  %changelog
--- 41,50 ----