packages: cdcat/cdcat.spec - 1.1 beta2 (not 1.2!, so Epoch1) - change sourc...

[uzsolt]

Author: uzsolt                       Date: Mon Jan 24 07:54:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.1 beta2 (not 1.2!, so Epoch1)
- change source0
- use make install

---- Files affected:
packages/cdcat:
   cdcat.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/cdcat/cdcat.spec
diff -u packages/cdcat/cdcat.spec:1.22 packages/cdcat/cdcat.spec:1.23
--- packages/cdcat/cdcat.spec:1.22	Mon Jan 24 02:59:21 2011
+++ packages/cdcat/cdcat.spec	Mon Jan 24 08:53:57 2011
@@ -1,15 +1,16 @@
 # $Revision$, $Date$
-%define		devstat	Beta1
+%define		devstat	beta2
 Summary:	Hyper's CdCatalog
 Summary(hu.UTF-8):	Hyper CD Katalógusa
 Summary(pl.UTF-8):	Katalog CDków Hypera
 Name:		cdcat
-Version:	1.2
+Version:	1.1
 Release:	1%{devstat}
+Epoch:		1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://cdcat.sourceforge.net/CdCat-Unicode-1.1%{devstat}-qt4.tar.gz
-# Source0-md5:	fe5925235bc7e8a2b6788419c0480c93
+Source0:	http://downloads.sourceforge.net/project/cdcat/cdcat/cdcat-1.1beta2/%{name}-%{version}%{devstat}.tar.bz2
+# Source0-md5:	1d26652cec7b844e0da670a92a181af4
 Source1:	%{name}.desktop
 Patch0:		%{name}-gcc4.patch
 Patch1:		%{name}-fstab.patch
@@ -46,37 +47,38 @@
 zmieniać, albo używać w miarę potrzeby.
 
 %prep
-%setup -q -n CdCat-Unicode-1.1%{devstat}-qt4
-%{__sed} -i "s,lrelease,lrelease-qt4,g" unicode-src/cdcat.pro
-# %patch0 -p0
-# %patch1 -p0
-# echo 'CONFIG += thread' >> src/cdcat.pro
+%setup -q -n %{name}-%{version}%{devstat}
+%{__sed} -i "s,lrelease,lrelease-qt4,g ;\
+	s,/local,,g ;\
+	s,\(distfiles.path =\).*,\1 %{_docdir}/%{name}-%{version}," \
+	src/cdcat.pro
 
 %build
-cd unicode-src
+cd src
 export QTDIR=%{_prefix}
 qmake-qt4 \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_LINK="%{__cxx}" \
-	QMAKE_CXXFLAGS_RELEASE="%{rpmcflags} -fno-exceptions -fno-rtti"
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcflags} -fno-exceptions -fno-rtti" \
+	cdcat.pro
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/cdcat/translations
+cd src
+%{__make} install INSTALL_ROOT=$RPM_BUILD_ROOT
 
-install -D unicode-src/cdcat $RPM_BUILD_ROOT%{_bindir}/cdcat
-install unicode-src/lang/cdcat_*.qm $RPM_BUILD_ROOT%{_datadir}/cdcat/translations
+install -D ../cdcat.png $RPM_BUILD_ROOT%{_pixmapsdir}/cdcat.png
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/cdcat.desktop
-install -D cdcat.png $RPM_BUILD_ROOT%{_pixmapsdir}/cdcat.png
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Authors README README_IMPORT TRANSLATORS_README TODO VERSION
+%docdir %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}-%{version}/*
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/cdcat
 %dir %{_datadir}/cdcat/translations
@@ -101,6 +103,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2011/01/24 07:53:57  uzsolt
+- 1.1 beta2 (not 1.2!, so Epoch1)
+- change source0
+- use make install
+
 Revision 1.22  2011/01/24 01:59:21  sparky
 - BR: qt4-build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdcat/cdcat.spec?r1=1.22&r2=1.23&f=u