merge master into f13

This commit is contained in:
Nathaniel McCallum 2010-10-10 21:06:07 -04:00
commit 27bd6510f1
3 changed files with 67 additions and 7 deletions

7
.gitignore vendored
View File

@ -1 +1,6 @@
libgpod-0.7.93.tar.gz
*~
*.rpm
*.tar.gz
/.build*.log
/libgpod-*/
/libgpod-0.7.95.tar.gz

View File

@ -2,7 +2,7 @@
Summary: Library to access the contents of an iPod
Name: libgpod
Version: 0.7.93
Version: 0.7.95
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: docbook-style-xsl
BuildRequires: glib2-devel
BuildRequires: gtk-sharp2-devel
BuildRequires: gtk2-devel
BuildRequires: gettext
BuildRequires: intltool
@ -19,6 +20,7 @@ BuildRequires: libplist-devel >= 1.0
BuildRequires: libusb1-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt
BuildRequires: mono-devel
BuildRequires: perl(XML::Parser)
BuildRequires: pygobject2-devel
BuildRequires: python-devel
@ -26,6 +28,7 @@ BuildRequires: python-mutagen
BuildRequires: sg3_utils-devel
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: autoconf
Requires: udev
%description
@ -57,7 +60,6 @@ License: GFDL
BuildArch: noarch
%endif
Requires: %{name} = %{version}-%{release}
Requires: gtk-doc
%description doc
Libgpod is a library to access the contents of an iPod. It supports playlists,
@ -77,10 +79,35 @@ A python module to access iPod content. This module provides bindings to the
libgpod library.
%package sharp
Summary: C#/.NET library to access iPod content
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
%description sharp
C#/.NET library to access iPod content. Provides bindings to the libgpod
library.
%package sharp-devel
Summary: Development files for libgpod-sharp
Summary: C#/.NET library to access iPod content
Group: Development/Languages
Requires: %{name}-sharp = %{version}-%{release}
Requires: pkgconfig
%description sharp-devel
C#/.NET library to access iPod content. Provides bindings to the libgpod
library.
This package contains the files required to develop programs that will use
libgpod-sharp.
%prep
%setup -q
# remove execute perms on the python examples as they'll be installed in %doc
# remove execute perms on the python examples as they'll be installed in %%doc
chmod -x bindings/python/examples/*.py
@ -97,6 +124,9 @@ make DESTDIR=%{buildroot} install
# remove Makefiles from the python examples dir
rm -rf bindings/python/examples/Makefile*
# remove execute perms from some libgpod-sharp files
chmod -x %{buildroot}/%{_libdir}/%{name}/*.dll.config
%clean
rm -rf %{buildroot}
@ -128,18 +158,43 @@ rm -rf %{buildroot}
%files doc
%defattr(-, root, root, 0755)
%{_datadir}/gtk-doc/html/%{name}
%{_datadir}/gtk-doc
%files -n python-gpod
%defattr(-, root, root, 0755)
%doc COPYING bindings/python/README bindings/python/examples
%{python_sitearch}/gpod
%exclude %{python_sitearch}/gpod/*.a
%exclude %{python_sitearch}/gpod/*.la
%files sharp
%defattr(-, root, root, 0755)
%{_libdir}/%{name}/%{name}-sharp*
%files sharp-devel
%defattr(-, root, root, 0755)
%{_libdir}/pkgconfig/%{name}-sharp.pc
%changelog
* Wed Sep 29 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.7.95-1
- Update to 0.7.95
- Drop upstreamed patches
* Sat Sep 04 2010 Todd Zullinger <tmz@pobox.com> - 0.7.94-1
- Update to 0.7.94
- Add mono subpackage (#630181)
* Mon Aug 23 2010 Todd Zullinger <tmz@pobox.com> - 0.7.93-4
- Own %%{_datadir}/gtk-doc rather than require gtk-doc (#604388)
* Tue Jul 27 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.93-3
- persuade configure to work with swig 2.0.0
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.93-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Tue Jun 15 2010 Todd Zullinger <tmz@pobox.com> - 0.7.93-1
- Update to 0.7.93
- Drop upstreamed mount-dir location patch

View File

@ -1 +1 @@
7d8ce00d78de50cb2414260512201b46 libgpod-0.7.93.tar.gz
8a761f678677a425436107cbd87aecf3 libgpod-0.7.95.tar.gz