[svn] r5502 - in trunk/rpms: aria2 git gnash swfdec syslinux
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Wed Jun 13 16:31:16 CEST 2007
Author: dag
Date: 2007-06-13 16:31:15 +0200 (Wed, 13 Jun 2007)
New Revision: 5502
Modified:
trunk/rpms/aria2/aria2.spec
trunk/rpms/git/git.spec
trunk/rpms/gnash/gnash.spec
trunk/rpms/swfdec/swfdec.spec
trunk/rpms/syslinux/syslinux.spec
Log:
Updates
Modified: trunk/rpms/aria2/aria2.spec
===================================================================
--- trunk/rpms/aria2/aria2.spec 2007-06-13 14:27:56 UTC (rev 5501)
+++ trunk/rpms/aria2/aria2.spec 2007-06-13 14:31:15 UTC (rev 5502)
@@ -4,24 +4,23 @@
Summary: Download utility with BitTorrent and Metalink support
Name: aria2
-%define real_version 0.10.2+1
-Version: 0.10.2.1
+Version: 0.11.0
Release: 1
License: GPL
Group: Applications/Internet
URL: http://aria2.sourceforge.net/
-Source: http://dl.sf.net/aria2/aria2-%{real_version}.tar.bz2
+Source: http://dl.sf.net/aria2/aria2-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: openssl-devel, libxml2-devel, gcc-c++, gettext
+BuildRequires: gcc-c++, gettext, openssl-devel, libxml2-devel
%description
aria2 is a download utility with resuming and segmented downloading.
Supported protocols are HTTP/HTTPS/FTP/BitTorrent/Metalink.
%prep
-%setup -n %{name}-%{real_version}
+%setup
%build
export CPPFLAGS="-I/usr/include/libxml2 $(pkg-config --cflags openssl)"
@@ -45,6 +44,9 @@
%{_bindir}/aria2c
%changelog
+* Tue Jun 12 2007 Dag Wieers <dag at wieers.com> - 0.11.0-1
+- Updated to release 0.11.0.
+
* Tue May 15 2007 Dag Wieers <dag at wieers.com> - 0.10.2.1-1
- Updated to release 0.10.2+1.
Modified: trunk/rpms/git/git.spec
===================================================================
--- trunk/rpms/git/git.spec 2007-06-13 14:27:56 UTC (rev 5501)
+++ trunk/rpms/git/git.spec 2007-06-13 14:31:15 UTC (rev 5502)
@@ -1,32 +1,34 @@
# $Id$
# Authority: dag
-%define real_name git-core
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
%{?dist: %{expand: %%define %dist 1}}
-%{?fc1:%define _without_asciidoc 1}
-%{?el3:%define _without_asciidoc 1}
-%{?rh9:%define _without_asciidoc 1}
-%{?rh8:%define _without_asciidoc 1}
-%{?rh7:%define _without_asciidoc 1}
-%{?el2:%define _without_asciidoc 1}
-%{?rh6:%define _without_asciidoc 1}
Summary: Git core and tools
Name: git
-Version: 0.99.4
-Release: 3
+Version: 1.5.2.1
+Release: 1
License: GPL
Group: Development/Tools
URL: http://git.or.cz/
-Source: http://kernel.org/pub/software/scm/git/git-core-%{version}.tar.gz
+Source: http://kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: zlib-devel, openssl-devel, curl-devel
-%{!?_without_asciidoc:BuildRequires: xmlto, asciidoc > 6.0.3}
Requires: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
+Obsoletes: git-arch <= %{version}-%{release}
+Provides: git-arch = %{version}-%{release}
+Obsoletes: git-cvs <= %{version}-%{release}
+Provides: git-cvs = %{version}-%{release}
+Obsoletes: git-email <= %{version}-%{release}
+Provides: git-email = %{version}-%{release}
+Obsoletes: git-svn <= %{version}-%{release}
+Provides: git-svn = %{version}-%{release}
+
%description
GIT comes in two layers. The bottom layer is merely an extremely fast
and flexible filesystem-based database designed to store directory trees
@@ -34,40 +36,75 @@
enables human beings to work with the database in a manner to a degree
similar to other SCM tools (like CVS, BitKeeper or Monotone).
+%package gui
+Summary: Graphical frontend to git
+Group: Development/Tools
+
+Requires: %{name} = %{version}-%{release}
+Requires: tk >= 8.4
+
+%description gui
+Graphical frontend to git.
+
+%package -n perl-Git
+Summary: Perl module that implements Git bindings
+Group: Development/CPAN
+
+Requires: %{name} = %{version}-%{release}
+
+%description -n perl-Git
+Git is a Perl module that implements Git bindings.
+
%prep
-%setup -n %{real_name}-%{version}
-# avoid warning about ../README:
-%{__perl} -pi -e "s|asciidoc |asciidoc --unsafe |g;" Documentation/Makefile
-# avoid asciidoc errors:
-%{__perl} -pi -e "s|\^|\\\^|g;" Documentation/git-rev-list.txt
+%setup
%build
-%{__make} %{?_smp_mflags} all %{!?_without_asciidoc:doc} prefix="%{_prefix}"
+%{__make} %{?_smp_mflags} all CFLAGS="%{optflags}" prefix="%{_prefix}" WITH_OWN_SUBPROCESS_PY="YesPlease"
%install
%{__rm} -rf %{buildroot}
-%{__make} install %{!?_without_asciidoc:install-doc} dest="%{buildroot}" prefix="%{_prefix}" mandir="%{_mandir}"
+%{__make} install DESTDIR="%{buildroot}" CFLAGS="%{optflags}" prefix="%{_prefix}" mandir="%{_mandir}" INSTALLDIRS="vendor"
+### Clean up buildroot
+find %{buildroot}%{_bindir} -type f -exec %{__perl} -pi -e 's|^$RPM_BUILD_ROOT||' {} \;
+%{__rm} -rf %{buildroot}%{perl_archlib} %{buildroot}%{perl_vendorarch}
+
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-, root, root, 0755)
%doc COPYING Documentation/*.txt README
-%{!?_without_asciidoc:%doc %{_mandir}/man1/*.1*}
-%{!?_without_asciidoc:%doc %{_mandir}/man7/*.7*}
+#%{!?_without_asciidoc:%doc %{_mandir}/man1/*.1*}
+#%{!?_without_asciidoc:%doc %{_mandir}/man7/*.7*}
%{_bindir}/git*
-%{_datadir}/git-core
+%exclude %{_bindir}/git-citool
+%exclude %{_bindir}/git-gui
+%{_datadir}/git-core/
+%files gui
+%defattr(-, root, root, 0755)
+%{_bindir}/git-citool
+%{_bindir}/git-gui
+%{_datadir}/git-gui/
+
+%files -n perl-Git
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man3/Git.3pm*
+%{perl_vendorlib}/Git.pm
+
%changelog
+* Mon Jun 11 2007 Dag Wieers <dag at wieers.com> - 1.5.2.1-1
+- Update to release 1.5.2.1.
+
+* Sat Jun 09 2007 Dag Wieers <dag at wieers.com> - 1.5.0.6-1
+- Update to release 1.5.0.6.
+
* Wed Feb 14 2007 Dries Verachtert <dries at ulyssis.org> - 0.99.4-3
- Fix location of templates (Dave Miller).
- Option '--unsafe' added to call to asciidoc.
- Fix asciidoc problem with '^'.
-* Sat Apr 08 2006 Dries Verachtert <dries at ulyssis.org> - 0.99.4-1.2
-- Rebuild for Fedora Core 5.
-
* Sun Aug 14 2005 Dries Verachtert <dries at ulyssis.org> - 0.99.4-1
- Update to release 0.99.4.
Modified: trunk/rpms/gnash/gnash.spec
===================================================================
--- trunk/rpms/gnash/gnash.spec 2007-06-13 14:27:56 UTC (rev 5501)
+++ trunk/rpms/gnash/gnash.spec 2007-06-13 14:31:15 UTC (rev 5502)
@@ -13,19 +13,19 @@
%{?rh7:%define _without_kde32 1}
%{?el2:%define _without_kde32 1}
-%ifarch x86_64
-%define _without_kde32 1
-%endif
+#ifarch x86_64
+#define _without_kde32 1
+#endif
Summary: Flash player
Name: gnash
-Version: 0.7.2
+Version: 0.8.0
Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://www.gnu.org/software/gnash/
-Source: ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gnash/%{version}/gnash-%{version}.tar.bz2
+Source: http://ftp.gnu.org/gnu/gnash/%{version}/gnash-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Buildrequires: SDL-devel, libxml2-devel, SDL_mixer-devel
@@ -35,7 +35,7 @@
%{!?_with_modxorg:BuildRequires: XFree86-devel}
%description
-A flash player.
+Gnash is an open-source flash player.
%package -n konqueror-gnash
Summary: Konqueror plugin for playing Flash movies
@@ -129,6 +129,9 @@
%{_libdir}/mozilla/plugins/
%changelog
+* Sun Jun 10 2007 Dag Wieers <dag at wieers.com> - 0.8.0-1
+- Updated to release 0.8.0.
+
* Mon Jan 15 2007 Dag Wieers <dag at wieers.com> - 0.7.2-1
- Updated to release 0.7.2.
Modified: trunk/rpms/swfdec/swfdec.spec
===================================================================
--- trunk/rpms/swfdec/swfdec.spec 2007-06-13 14:27:56 UTC (rev 5501)
+++ trunk/rpms/swfdec/swfdec.spec 2007-06-13 14:31:15 UTC (rev 5502)
@@ -27,7 +27,7 @@
%{?fc5: %define _without_mozilla 1}
%{?fc1: %define _without_mozilla 1}
-### Ca't figure out why only EL5 produces swfdec-mozilla-player
+### Can't figure out why only EL5 produces swfdec-mozilla-player
%{?el5:%define _with_mozilla_player 1}
%define mozilla seamonkey
Modified: trunk/rpms/syslinux/syslinux.spec
===================================================================
--- trunk/rpms/syslinux/syslinux.spec 2007-06-13 14:27:56 UTC (rev 5501)
+++ trunk/rpms/syslinux/syslinux.spec 2007-06-13 14:31:15 UTC (rev 5502)
@@ -8,7 +8,7 @@
Summary: Kernel bootloader for FAT or ISO9660 filesystems or PXE networks
Name: syslinux
-Version: 3.50
+Version: 3.51
Release: 1
License: GPL
Group: Applications/System
@@ -61,6 +61,9 @@
%{_libdir}/syslinux/
%changelog
+* Tue Jun 12 2007 Dag Wieers <dag at wieers.com> - 3.51-1
+- Updated to release 3.51.
+
* Sun Jun 10 2007 Dag Wieers <dag at wieers.com> - 3.50-1
- Updated to release 3.50.
More information about the svn-commits
mailing list