rpms/kalgebra/FC-6 kalgebra-0.5-autotools.patch, NONE, 1.1 kalgebra.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon Feb 5 22:21:55 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/kalgebra/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29336/FC-6
Modified Files:
.cvsignore sources
Added Files:
kalgebra-0.5-autotools.patch kalgebra.spec
Log Message:
auto-import kalgebra-0.5-3 on branch FC-6 from kalgebra-0.5-3.src.rpm
kalgebra-0.5-autotools.patch:
--- NEW FILE kalgebra-0.5-autotools.patch ---
--- admin/cvs.sh 2006-04-07 19:07:27.000000000 +0200
+++ cvs.sh 2006-12-18 08:41:24.000000000 +0100
@@ -29,7 +29,7 @@
{
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 2.52, 2.53 or 2.54"
@@ -41,10 +41,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 2.52 or 2.53 (part of autoconf)"
@@ -64,7 +64,7 @@
echo "*** KDE requires automake 1.6.1 or newer"
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 1.6.1 or newer"
@@ -85,12 +85,12 @@
cvs()
{
check_autotool_versions
-
+
### Produce acinclude.m4
if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then
echo "*** Creating acinclude.m4"
rm -f acinclude.m4 configure.files
-
+
strip_makefile
$MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4
fi
@@ -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
@@ -235,7 +235,7 @@
done
fi
-for topleveldir in $topleveldirs; do
+for topleveldir in $topleveldirs; do
if test -f $topleveldir/configure.in; then
continue
fi
@@ -256,7 +256,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
@@ -287,10 +287,10 @@
VERSION="\"3.1.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
@@ -338,7 +338,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
@@ -350,7 +350,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
@@ -387,7 +387,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
@@ -518,7 +518,7 @@
$MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
- messages
+ messages
exit_code=$?
if test "$exit_code" != 0; then
echo "make exit code: $exit_code"
--- NEW FILE kalgebra.spec ---
%define real_version 20060501
Name: kalgebra
Version: 0.5
Release: 3%{?dist}
Summary: MathML-based graph calculator
License: GPL
Group: Applications/Engineering
URL: http://%{name}.berlios.de
Source: http://download.berlios.de/kalgebra/kalgebra-%{real_version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: %{name}-%{version}-autotools.patch
BuildRequires: kdelibs-devel, gettext, automake
%description
KAlgebra is a MathML-based graph calculator.
Besides it was initially mathml oriented now it can be used
by everyone with little mathematic knowledge.
%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
%{__make} -f admin/Makefile.common cvs
%build
%configure --disable-rpath
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
desktop-file-install --vendor "" \
--add-category "Education" \
--add-category "Math" \
--dir %{buildroot}%{_datadir}/applications/ \
--delete-original \
%{buildroot}%{_datadir}/applnk/Utilities/%{name}.desktop
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%clean
%{__rm} -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_bindir}/%{name}
%{_datadir}/icons/crystalsvg/*/*/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/apps/%{name}/
%Changelog
* Thu Feb 01 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.5-3
- Fix presence in gnome menu
* Sat Jan 27 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.5-2
- dropped duplicate files
* Sat Jun 03 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.5-1
- Initial package.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kalgebra/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Feb 2007 21:55:23 -0000 1.1
+++ .cvsignore 5 Feb 2007 22:21:23 -0000 1.2
@@ -0,0 +1 @@
+kalgebra-20060501.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kalgebra/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Feb 2007 21:55:23 -0000 1.1
+++ sources 5 Feb 2007 22:21:23 -0000 1.2
@@ -0,0 +1 @@
+8fb7edabb6b59c7606decf2f70da8dcd kalgebra-20060501.tar.bz2
More information about the scm-commits
mailing list