- version update

- use qt4 version

Changed files:
    cdcat.spec -> 1.20

diff --git a/cdcat.spec b/cdcat.spec
index 9c5b4e30eeae828fa8d96ca3dd9f7c9d8f398007..bcaae4bf12fc4494dec2065583fdc02a70def167 100644 (file)
--- a/cdcat.spec
+++ b/cdcat.spec
@@ -1,21 +1,25 @@
+%define                devstat Beta1
+%define                snap    20101109
 Summary:       Hyper's CdCatalog
 Summary(hu.UTF-8):     Hyper CD Katalógusa
 Summary(pl.UTF-8):     Katalog CDków Hypera
 Name:          cdcat
-Version:       1.01b
-Release:       3
+Version:       1.1
+Release:       1%{devstat}
 License:       GPL
 Group:         Applications
-Source0:       http://cdcat.sourceforge.net/%{name}-%{version}.tar.bz2
-# Source0-md5: 59b321ff3848b34cb6862fd2a408cb44
+Source0:       http://cdcat.sourceforge.net/CdCat-Unicode-1.1%{devstat}-qt4_%{snap}.tar.bz2
+# Source0-md5: adf1294ce6a1507767b09542372fd990
 Source1:       %{name}.desktop
 Patch0:                %{name}-gcc4.patch
 Patch1:                %{name}-fstab.patch
 URL:           http://cdcat.sourceforge.net/
 BuildRequires: expat-devel >= 1.95.2
 BuildRequires: pcre-devel >= 1.1.4
-BuildRequires: qmake
-BuildRequires: qt-devel >= 2.0.3
+BuildRequires: qt4-qmake
+BuildRequires: qt4-linguist
+BuildRequires: Qt3Support-devel
+BuildRequires: QtGui-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,15 +45,16 @@ pliku. Baza danych jest w gzipowanym pliku XML, więc można ją
 zmieniać, albo używać w miarę potrzeby.
 
 %prep
-%setup -q -n CdCat-%{version}
-%patch0 -p0
-%patch1 -p0
-echo 'CONFIG += thread' >> src/cdcat.pro
+%setup -q -n CdCat-Unicode-1.1%{devstat}-qt4_%{snap}
+%{__sed} -i "s,lrelease,lrelease-qt4,g" unicode-src/cdcat.pro
+# %patch0 -p0
+# %patch1 -p0
+# echo 'CONFIG += thread' >> src/cdcat.pro
 
 %build
-cd src
+cd unicode-src
 export QTDIR=%{_prefix}
-qmake \
+qmake-qt4 \
        QMAKE_CXX="%{__cxx}" \
        QMAKE_LINK="%{__cxx}" \
        QMAKE_CXXFLAGS_RELEASE="%{rpmcflags} -fno-exceptions -fno-rtti"
@@ -60,8 +65,8 @@ qmake \
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/cdcat/translations
 
-install -D src/cdcat $RPM_BUILD_ROOT%{_bindir}/cdcat
-install src/lang/cdcat_*.qm $RPM_BUILD_ROOT%{_datadir}/cdcat/translations
+install -D unicode-src/cdcat $RPM_BUILD_ROOT%{_bindir}/cdcat
+install unicode-src/lang/cdcat_*.qm $RPM_BUILD_ROOT%{_datadir}/cdcat/translations
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/cdcat.desktop
 install -D cdcat.png $RPM_BUILD_ROOT%{_pixmapsdir}/cdcat.png
 
@@ -70,7 +75,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Authors ChangeLog README README_IMPORT TRANSLATORS_README TODO VERSION
+%doc Authors README README_IMPORT TRANSLATORS_README TODO VERSION
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/cdcat
 %dir %{_datadir}/cdcat/translations
@@ -78,13 +83,13 @@ rm -fr $RPM_BUILD_ROOT
 %lang(de) %{_datadir}/cdcat/translations/cdcat_de.qm
 %lang(el) %{_datadir}/cdcat/translations/cdcat_el.qm
 %lang(es) %{_datadir}/cdcat/translations/cdcat_es.qm
-%lang(fr) %{_datadir}/cdcat/translations/cdcat_fr.qm
+# %lang(fr) %{_datadir}/cdcat/translations/cdcat_fr.qm
 %lang(hu) %{_datadir}/cdcat/translations/cdcat_hu.qm
 %lang(id) %{_datadir}/cdcat/translations/cdcat_id.qm
-%lang(it) %{_datadir}/cdcat/translations/cdcat_it.qm
+# %lang(it) %{_datadir}/cdcat/translations/cdcat_it.qm
 %lang(pl) %{_datadir}/cdcat/translations/cdcat_pl.qm
 %lang(pt) %{_datadir}/cdcat/translations/cdcat_pt.qm
 %lang(sk) %{_datadir}/cdcat/translations/cdcat_sk.qm
-%lang(sr) %{_datadir}/cdcat/translations/cdcat_sr.qm
+# %lang(sr) %{_datadir}/cdcat/translations/cdcat_sr.qm
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*