rpms/kid3/devel .cvsignore, 1.8, 1.9 kid3.spec, 1.22, 1.23 sources, 1.8, 1.9 kid3-0.10-defaultbrowser.patch, 1.1, NONE kid3-0.10-docdir.patch, 1.1, NONE kid3-0.10-includes.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/kid3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10556

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-0.10-defaultbrowser.patch kid3-0.10-docdir.patch 
	kid3-0.10-includes.patch 
Log Message:
* Thu Apr  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1
- 1.0, all patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Dec 2007 22:39:11 -0000	1.8
+++ .cvsignore	3 Apr 2008 19:12:19 -0000	1.9
@@ -1 +1 @@
-kid3-0.10.tar.gz
+kid3-1.0.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kid3.spec	6 Jan 2008 18:23:52 -0000	1.22
+++ kid3.spec	3 Apr 2008 19:12:19 -0000	1.23
@@ -3,17 +3,14 @@
 %endif
 
 Name:           kid3
-Version:        0.10
-Release:        3%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kid3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.10-docdir.patch
-Patch1:         %{name}-0.10-defaultbrowser.patch
-Patch2:         %{name}-0.10-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?kde3}
@@ -42,9 +39,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|g' configure # lib64 rpaths
 
 
@@ -60,12 +54,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
+# deb-kde3/kid3.1 == deb-kde4/kid3-kde4.1 as of 1.0
+install -Dpm 644 deb-kde3/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
+
 # preserve desktop entry location for from < 0.8 upgrades
 mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
 rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
+
 %find_lang %{name}
+
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
   f=$(readlink $file) ; d=$(dirname ${file#$RPM_BUILD_ROOT})
@@ -96,6 +95,7 @@
 %if 0%{?kde3}
 %{_datadir}/apps/kid3/
 %else
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/kde4/apps/kid3/
 %endif
 %lang(en) %{_docdir}/HTML/en/kid3/
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Thu Apr  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-1
+- 1.0, all patches applied upstream.
+
 * Thu Jan  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.10-3
 - Fix build with gcc 4.3's cleaned up C++ headers.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Dec 2007 22:39:11 -0000	1.8
+++ sources	3 Apr 2008 19:12:19 -0000	1.9
@@ -1 +1 @@
-7333a1f12249467aa1233b374128a8d9  kid3-0.10.tar.gz
+5ee685dcba0c7feb08846cd4dec643cf  kid3-1.0.tar.gz


--- kid3-0.10-defaultbrowser.patch DELETED ---


--- kid3-0.10-docdir.patch DELETED ---


--- kid3-0.10-includes.patch DELETED ---