SPECS: m4.spec - move things from DEVEL to HEAD and from HEAD to D...

arekm arekm at pld-linux.org
Fri Feb 23 21:39:37 CET 2007 

Author: arekm                        Date: Fri Feb 23 20:39:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- move things from DEVEL to HEAD and from HEAD to DEVEL (branches swap)

---- Files affected:
SPECS:
   m4.spec (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: SPECS/m4.spec
diff -u SPECS/m4.spec:1.88 SPECS/m4.spec:1.89
--- SPECS/m4.spec:1.88	Tue Feb 13 07:46:53 2007
+++ SPECS/m4.spec	Fri Feb 23 21:39:32 2007
@@ -1,23 +1,24 @@
 # $Revision$, $Date$
+#
+# TODO:
+# - buserror needs check
+# - should we use all the stuff before configure? (builds without, breaks with autoconf)
+# - branch name is totally bogus, it could be "m4_1_4", definitely not "DEVEL"
 Summary:	GNU Macro Processor
-Summary(de.UTF-8):	GNU-Makro-Prozessor
-Summary(fr.UTF-8):	Processeur de macros de GNU
-Summary(pl.UTF-8):	GNU procesor języka makrodefinicji
-Summary(tr.UTF-8):	GNU Makroİşlemcisi
+Summary(de.UTF-8):   GNU-Makro-Prozessor
+Summary(fr.UTF-8):   Processeur de macros de GNU
+Summary(pl.UTF-8):   GNU procesor języka makrodefinicji
+Summary(tr.UTF-8):   GNU Makroİşlemcisi
 Name:		m4
-Version:	1.4q
-Release:	2
+Version:	1.4.8
+Release:	0.1
 Epoch:		2
 License:	GPL
 Group:		Applications/Text
-#Source0:	ftp://ftp.seindal.dk/gnu/%{name}-%{version}%{_pre}.tar.gz
-Source0:	http://www.lrde.epita.fr/~akim/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	de5ffda17f317b12272286ea93c9f2c0
+Source0:	ftp://ftp.gnu.org/gnu/m4/%{name}-%{version}.tar.bz2
+# Source0-md5:	6bbf917e5d8fab20b38d43868c3944d3
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-pl.po-update.patch
-Patch2:		%{name}-po-fix.patch
-Patch3:		%{name}-fixes-1.4.1.patch
-Patch4:		%{name}-buserror.patch
+#Patch1:		%{name}-buserror.patch
 URL:		http://www.gnu.org/software/m4/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7.1
@@ -58,7 +59,7 @@
 
 %package devel
 Summary:	Files to develop application with embedded m4 interpreter
-Summary(pl.UTF-8):	Pliki do tworzenia aplikacji z wbudowanym interpreterem m4
+Summary(pl.UTF-8):   Pliki do tworzenia aplikacji z wbudowanym interpreterem m4
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
@@ -70,7 +71,7 @@
 
 %package static
 Summary:	Static m4 library
-Summary(pl.UTF-8):	Statyczna biblioteka m4
+Summary(pl.UTF-8):   Statyczna biblioteka m4
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
@@ -83,27 +84,19 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch1 -p1
 
 rm -f config/{libtool,ltdl}.m4
 
 %build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal} -I config
-%{__autoheader}
-%{__autoconf}
-%{__automake}
+#%%{__gettextize}
+#%%{__libtoolize}
+#%%{__aclocal}
+#%%{__autoheader}
+#%%{__autoconf}
+#%%{__automake}
 %configure \
 	PACKAGE=m4 \
-	--disable-ltdl-install \
-	--disable-rpath \
-	--enable-static \
-	--with-gmp \
-	--with-modules \
 	%{!?debug:--without-dmalloc}
 
 %{__make}
@@ -114,55 +107,48 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/m4/*.a
-
-%find_lang %{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
 %doc NEWS README THANKS AUTHORS ChangeLog TODO
 %attr(755,root,root) %{_bindir}/m4
-%attr(755,root,root) %{_libdir}/libm4.so.*.*
-%dir %{_libdir}/m4
-%attr(755,root,root) %{_libdir}/m4/*.so*
-%{_libdir}/m4/*.la
-%{_datadir}/m4
-%{_infodir}/m4*
+%{_infodir}/*.info*
 %{_mandir}/man1/*
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libm4.so
-%{_libdir}/libm4.la
-%{_includedir}/*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libm4.a
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.88  2007/02/13 06:46:53  glen
-- tabs in preamble
+Revision 1.89  2007/02/23 20:39:32  arekm
+- move things from DEVEL to HEAD and from HEAD to DEVEL (branches swap)
 
-Revision 1.87  2007/02/12 00:49:06  baggins
+Revision 1.86.2.5  2007/02/12 13:20:14  baggins
 - converted to UTF-8
 
+Revision 1.86.2.4  2006/11/26 02:15:14  arekm
+- up to 1.4.8
+
+Revision 1.86.2.3  2006/11/01 15:56:45  qboosh
+- cleanup (m4 1.4 didn't support loadable modules or NLS)
+
+Revision 1.86.2.2  2006/11/01 14:14:41  glen
+- preambles shouldn't be commented out
+
+Revision 1.86.2.1  2006/11/01 13:44:49  czarny
+- updated after some years
+- why the heck do we use old 1.4g stuff, not 1.4.7 anyway?
+- a lot of stuff to check
+
 Revision 1.86  2006/07/18 13:18:02  qboosh
 - updated URL
 
@@ -223,14 +209,14 @@
 
 Revision 1.68  2003/04/10 14:24:42  speedy
 - fixed broken ac_am patch
-- release 0.%%{_pre}.7
+- release 0.%{_pre}.7
 
 Revision 1.67  2003/04/05 18:46:32  kloczek
-- release 0.%%{_pre}.6,
+- release 0.%{_pre}.6,
 - added gmp-devel to BuildRequires (because m4 is configured --with-gmp).
 
 Revision 1.66  2003/04/05 14:20:18  kloczek
-- 0.%%{_pre}.5 release,
+- 0.%{_pre}.5 release,
 - merge ac, ld, ltdl ipatches and add many more ac/am cleanups,
 - before regenerate ac/am/lt/ah resources remove from build tree only acm4/ltdl.m4.
 
@@ -248,7 +234,7 @@
 - Epoch 2 (no strict relation between 1:0.1pre2 and 1:0.pre2.2)
 
 Revision 1.61  2003/03/07 03:36:41  wiget
-- run ldconfig in %%post/%%postun
+- run ldconfig in %post/%postun
 
 Revision 1.60  2003/03/07 00:23:07  wiget
 - fix release tag
@@ -274,7 +260,7 @@
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.54  2002/06/23 20:52:52  kloczek
-perl -pi -e "s/^gettextize --copy --force/\%%\{__gettextize\}/"
+perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/"
 
 Revision 1.53  2002/06/23 20:32:32  kloczek
 - perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
@@ -332,10 +318,10 @@
 - BuildRequires: libltdl
 
 Revision 1.35  2000/06/09 07:54:44  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.34  2000/06/09 07:23:25  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.33  2000/05/24 16:50:46  zagrodzki
 - changed [ -x ... ] && to [ ! -x ... ] ||
@@ -368,12 +354,12 @@
 - removed runing autoconf, aclocal and automake from %build.
 
 Revision 1.26  1999/09/26 20:00:01  kloczek
-- added using %%configure macro (autoconf patch) and DESTDIR style %install,
+- added using %configure macro (autoconf patch) and DESTDIR style %install,
 - added "BuildRequires: gettext-devel",
 - new %description from rawhide spec.
 
 Revision 1.25  1999/09/24 10:45:02  pius
-- moved running of /usr/sbin/fix-info-dir to %%postun
+- moved running of /usr/sbin/fix-info-dir to %postun
 - release up
 
 Revision 1.24  1999/09/19 09:41:00  pius
@@ -382,9 +368,3 @@
 
 Revision 1.23  1999/07/12 23:06:06  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Sat May 29 1999 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  [1.4n-6]
-- based on RH spec,
-- spec rewrited by PLD team,
-- pl translation Wojtek Ślusarczyk <wojtek at shadow.eu.org>.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/m4.spec?r1=1.88&r2=1.89&f=u

More information about the pld-cvs-commit mailing list