rpms/keurocalc/devel keurocalc-0.9.7-autotools.patch, NONE, 1.1 keurocalc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Chitlesh GOORAH (chitlesh) <fedora-extras-commits redhat com>]

Author: chitlesh

Update of /cvs/extras/rpms/keurocalc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27191/devel

Modified Files:
	.cvsignore sources 
Added Files:
	keurocalc-0.9.7-autotools.patch keurocalc.spec 
Log Message:
auto-import keurocalc-0.9.7-1 on branch devel from keurocalc-0.9.7-1.src.rpm

keurocalc-0.9.7-autotools.patch:

--- NEW FILE keurocalc-0.9.7-autotools.patch ---
--- admin/cvs.sh	2006-06-08 00:10:32.000000000 +0200
+++ cvs.sh_diff	2006-11-27 12:12:50.000000000 +0100
@@ -32,7 +32,7 @@
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  Autoconf*2.6* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  Autoconf*2.6* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
@@ -68,7 +68,7 @@
     echo "*** KDE requires automake $required_automake_version"
     exit 1
     ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
     echo "*** $AUTOMAKE_STRING found."
     UNSERMAKE=no
     ;;
@@ -94,7 +94,7 @@
 cvs()
 {
 check_autotool_versions
-acinclude_m4 
+acinclude_m4
 
 ### Make new subdirs and configure.in.
 ### The make calls could be optimized away here,
@@ -106,7 +106,7 @@
 
     if test -r Makefile.am.in; then
         echo "*** Creating Makefile.am"
-        if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then 
+        if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then
             strip_makefile
             $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1
         else
@@ -115,7 +115,7 @@
      fi
      configure_files
      echo "*** Creating configure.in"
-     if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then 
+     if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then
        strip_makefile
        $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
      else
@@ -168,7 +168,7 @@
   create_subdirs
 
   if test -r Makefile.am.in; then
-    if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then 
+    if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then
       strip_makefile
       $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1
     else
@@ -176,7 +176,7 @@
     fi
   fi
   configure_files
-  if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then 
+  if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then
     strip_makefile
     $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
   else
@@ -241,7 +241,7 @@
 test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
 list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"`
 : > configure.in.new
-for file in $list; do 
+for file in $list; do
   echo "dnl =======================================================" >> configure.in.new
   echo "dnl FILE: $file" >> configure.in.new
   echo "dnl =======================================================" >> configure.in.new
@@ -275,7 +275,7 @@
     done
 fi
 
-for topleveldir in $topleveldirs; do 
+for topleveldir in $topleveldirs; do
   if test -f $topleveldir/configure.in; then
 	continue
   fi
@@ -292,7 +292,7 @@
 
 files=`cat configure.files`
 list=`egrep '^dnl AC_OUTPUT\(.*\)' $files | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1#"`
-for file in $list; do 
+for file in $list; do
     echo "AC_CONFIG_FILES([ $file ])" >>  configure.in.new
 done
 
@@ -319,10 +319,10 @@
      VERSION="\"3.5.2\""
 fi
 if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
-   modulename=`pwd`; 
+   modulename=`pwd`;
    modulename=`basename $modulename`
    esc_VERSION=`echo $VERSION | sed -e "s#[^.0-9a-zA-Z]##g"`
-   modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"`   
+   modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"`
 
 fi
 if test -n "$kde_use_qt_param"; then
@@ -375,7 +375,7 @@
 
 create_subdirs()
 {
-if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then 
+if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then
     # as many modules contain rules to create subdirs without any
     # dependencies make won't create it unless there is no file.
     # so we check if that's a dummy rule or one that works
@@ -387,7 +387,7 @@
     $MAKE -f $makefile_wo top_srcdir=. ./subdirs || exit 1
     if test -f subdirs.cvs.sh.$$; then
 	if test -s subdirs; then
-	    rm subdirs.cvs.sh.$$ 
+	    rm subdirs.cvs.sh.$$
 	else
 	    mv subdirs.cvs.sh.$$ subdirs
 	fi
@@ -424,7 +424,7 @@
    echo $d >> ./_SUBDIRS
 done
 
-(for d in $dirs; do 
+(for d in $dirs; do
    list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
    for s in $list; do
       echo $s $d
@@ -471,7 +471,7 @@
     adds=`ls -d -1 $adds 2>/dev/null`
     fgrep -v  '$(top_srcdir)/acinclude.m4:' Makefile.am.in > Makefile.am.in.adds
     str='$(top_srcdir)/acinclude.m4:'
-    for add in $adds; do 
+    for add in $adds; do
 	str="$str \$(top_srcdir)/$add"
     done
     echo $str >> Makefile.am.in.adds
@@ -491,7 +491,7 @@
 {
   echo "*** Creating acinclude.m4"
   adds=
-  if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then 
+  if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
     strip_makefile
     rm -f acinclude.m4
     adds=`grep '\$(top_srcdir)/acinclude.m4:' $makefile_wo | sed -e 's,^[^:]*: *,,; s,\$(top_srcdir),.,g'`


--- NEW FILE keurocalc.spec ---
Name:          keurocalc
Version:       0.9.7
Release:       1%{?dist}
Summary:       KEuroCalc is a universal currency converter and calculator

License:       GPL
Group:         Applications/Productivity

URL:           http://opensource.bureau-cornavin.com/%{name}/
Source:        http://opensource.bureau-cornavin.com/%{name}/%{name}-%{version}.tgz
Patch0:        keurocalc-0.9.7-autotools.patch

BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: kdelibs-devel, gettext, automake
# desktop-file-utils


%description
KEuroCalc is a universal currency converter and calculator. It
can convert from and to many currencies, either with a fixed
conversion rate or a variable conversion rate. It directly
downloads the latest variable rates through the Internet


%prep
%setup -q -n %{name}

# fix for autoconf >= 2.6 & automake >= 2.10 on admin/cvs.sh
%if "%{?fedora}" > "6"
%patch -p0 -b .autotools
%endif

# to skip unsermake dependency
%{__make} -f admin/Makefile.common cvs


%build
%configure --disable-rpath

%{__make} %{?_smp_mflags}


%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install


# Prior to desktop-file-install, the small hack below was used:
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172423
#desktop-file-install --vendor ""             \
#  --dir %{buildroot}%{_datadir}/applications \
#  --add-category "Office"                    \
#  --delete-original                          \
#  %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop

# to skip the Lost&Found menu
echo "Categories=Office;" >> \
    %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop

# The "Application" category is non-standard
install -d %{buildroot}%{_datadir}/applications
%{__mv} %{buildroot}%{_datadir}/applnk/Applications/%{name}.desktop \
        %{buildroot}%{_datadir}/applications

%find_lang %{name}


%post
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:


%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:


%clean
%{__rm} -rf %{buildroot}


%files -f %{name}.lang
%defattr(-, root, root, -)
%doc AUTHORS COPYING* TODO
%{_bindir}/%{name}
%{_datadir}/apps/%{name}/
%{_docdir}/HTML/??/%{name}/
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop


%Changelog
* Mon Nov 27 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 0.9.7-1
- patch0 : fix for autoconf >= 2.6  & automake >= 2.10 in order to rpmbuild properly on rawhide

* Wed Nov 22 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 0.9.7-0.1
- Initial Package.

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keurocalc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Dec 2006 17:35:26 -0000	1.1
+++ .cvsignore	1 Dec 2006 17:36:58 -0000	1.2
@@ -0,0 +1 @@
+keurocalc-0.9.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keurocalc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Dec 2006 17:35:26 -0000	1.1
+++ sources	1 Dec 2006 17:36:58 -0000	1.2
@@ -0,0 +1 @@
+d2e22dcbba267549bf3a93ed8bf715c2  keurocalc-0.9.7.tgz