rpms/kpolynome/devel kpolynome-0.1.2-autotools.patch, NONE, 1.1 kpolynome.spec, 1.3, 1.4
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sat Feb 3 22:24:53 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/kpolynome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32165/devel
Modified Files:
kpolynome.spec
Added Files:
kpolynome-0.1.2-autotools.patch
Log Message:
auto-import kpolynome-0.1.2-9 on branch devel from kpolynome-0.1.2-9.src.rpm
kpolynome-0.1.2-autotools.patch:
--- NEW FILE kpolynome-0.1.2-autotools.patch ---
--- admin/cvs.sh 2005-04-06 22:51:55.000000000 +0200
+++ cvs.sh 2007-02-03 22:26:20.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"
@@ -44,10 +44,10 @@
exit 1
;;
esac
-
+
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"
@@ -70,7 +70,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 NOT FOUND!."
echo "*** KDE requires automake $required_automake_version"
@@ -93,7 +93,7 @@
cvs()
{
check_autotool_versions
-acinclude_m4
+acinclude_m4
### Make new subdirs and configure.in.
### The make calls could be optimized away here,
@@ -105,7 +105,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
@@ -114,7 +114,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
@@ -166,7 +166,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
@@ -174,7 +174,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
@@ -237,7 +237,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
@@ -271,7 +271,7 @@
done
fi
-for topleveldir in $topleveldirs; do
+for topleveldir in $topleveldirs; do
if test -f $topleveldir/configure.in; then
continue
fi
@@ -288,7 +288,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
@@ -315,10 +315,10 @@
VERSION="\"3.4.0\""
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
@@ -371,7 +371,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
@@ -383,7 +383,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
@@ -420,7 +420,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
@@ -467,7 +467,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
@@ -487,7 +487,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'`
Index: kpolynome.spec
===================================================================
RCS file: /cvs/extras/rpms/kpolynome/devel/kpolynome.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kpolynome.spec 3 Feb 2007 20:24:22 -0000 1.3
+++ kpolynome.spec 3 Feb 2007 22:24:21 -0000 1.4
@@ -1,7 +1,7 @@
Name: kpolynome
#Version 0.1-2 second upstream release
Version: 0.1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A polynome calculation program for KDE
License: GPL
@@ -9,6 +9,7 @@
URL: http://sourceforge.net/projects/%{name}
Source: http://sourceforge.net/projects/%{name}/%{name}-0.1-2.tar.gz
Patch0: kpolynome-0.1-2-desktop.patch
+Patch1: %{name}-%{version}-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake, kdelibs-devel, desktop-file-utils
@@ -21,6 +22,13 @@
%prep
%setup -q -n %{name}-0.1
+# fix for autoconf >= 2.6 & automake >= 2.10 on admin/cvs.sh
+%if "%{?fedora}" > "6"
+%patch1 -p0 -b .autotools
+%endif
+
+%{__make} -f admin/Makefile.common cvs
+
%patch0 -p0 -b %{name}.desktop
%build
@@ -70,6 +78,9 @@
%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
%Changelog
+* Sat Feb 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.1.2-9
+- Rebuild for FC-7 devel with autotools patched
+
* Sat Feb 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.1.2-8
- rebuilt and fixed duplicates in the kmenu
More information about the scm-commits
mailing list