rpms/k3b/devel .cvsignore, 1.16, 1.17 k3b.spec, 1.44, 1.45 sources, 1.17, 1.18 k3b-1.0.1-hidden.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore k3b.spec sources 
Removed Files:
	k3b-1.0.1-hidden.patch 
Log Message:
* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.2-1
- k3b-1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	30 May 2007 15:02:18 -0000	1.16
+++ .cvsignore	25 Jun 2007 03:27:10 -0000	1.17
@@ -2,3 +2,5 @@
 k3b-i18n-1.0.tar.bz2
 k3b-1.0.1.tar.bz2
 k3b-i18n-1.0.1.tar.bz2
+k3b-1.0.2.tar.bz2
+k3b-i18n-1.0.2.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- k3b.spec	16 Jun 2007 20:01:24 -0000	1.44
+++ k3b.spec	25 Jun 2007 03:27:10 -0000	1.45
@@ -1,5 +1,3 @@
-%define tar_version 1.0.1
-%define i18n_version 1.0.1
 
 ## distro/release specific support
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
@@ -9,22 +7,20 @@
 Name:    k3b
 Summary: CD/DVD burning application for KDE
 Epoch:   0
-Version: 1.0.1
-Release: 4%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 
 Group:   Applications/Archiving
 License: GPL
 URL:     http://www.k3b.org
-Source0: http://dl.sf.net/k3b/k3b-%{tar_version}.tar.bz2
-Source1: http://dl.sf.net/k3b/k3b-i18n-%{i18n_version}.tar.bz2
+Source0: http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
+Source1: http://dl.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
 Source2: k3brc
 
 Patch1: k3b-i18n-0.12.17-rellink.patch
-# See http://bugzilla.redhat.com/244513
-Patch2: k3b-1.0.1-hidden.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+# TODO: bugzilla/document
 ExcludeArch: s390 s390x
 
 BuildRequires: kdelibs-devel 
@@ -74,18 +70,15 @@
 
 
 %prep
-%setup -q -a 1 -n %{name}-%{tar_version}
+%setup -q -a 1 -n %{name}-%{version}
 
-pushd %{name}-i18n-%{i18n_version}
+pushd %{name}-i18n-%{version}
 %patch1 -p2 -b .lns
 #aclocal
 #autoconf
 make -f admin/Makefile.common
 popd
 
-%patch2 -p1 -b .hidden
-make -f admin/Makefile.common
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -110,7 +103,7 @@
 make %{?_smp_mflags}
 
 # Build for i18n tarball
-pushd %{name}-i18n-%{i18n_version}
+pushd %{name}-i18n-%{version}
 %configure
 make %{?_smp_mflags}
 popd
@@ -121,7 +114,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Install for i18n tarball
-pushd %{name}-i18n-%{i18n_version}
+pushd %{name}-i18n-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
@@ -176,6 +169,7 @@
 %doc AUTHORS README COPYING TODO ChangeLog
 %{_bindir}/k3b
 %{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
 %{_datadir}/mimelnk/application/x-k3b.desktop
 %{_libdir}/libk3b*.so.*
 
@@ -211,13 +205,16 @@
 # devel subpackage
 %files devel
 %defattr(-,root,root,755)
-%doc %{name}-i18n-%{i18n_version}/README 
-%doc %{name}-i18n-%{i18n_version}/COPYING 
+%doc %{name}-i18n-%{version}/README 
+%doc %{name}-i18n-%{version}/COPYING 
 %{_includedir}/k3b/
 %{_libdir}/libk3b*.so
 
 
 %changelog
+* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.2-1
+- k3b-1.0.2
+
 * Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-4
 - k3b-iso.desktop,k3b-cue.desktop: +NoDisplay=True (#244513)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	30 May 2007 15:02:18 -0000	1.17
+++ sources	25 Jun 2007 03:27:10 -0000	1.18
@@ -1,2 +1,2 @@
-8abd11f56e6e40d6f2d0b076a5f8b8ed  k3b-1.0.1.tar.bz2
-f87a27408a4153d860103816ba83db09  k3b-i18n-1.0.1.tar.bz2
+b9307b3de0d15880a57c23a007bffca4  k3b-1.0.2.tar.bz2
+3c9b3e76e7781f15b1373f2f5c1dc0b3  k3b-i18n-1.0.2.tar.bz2


--- k3b-1.0.1-hidden.patch DELETED ---