Version: 1.0.3

diff --git a/gajim.spec b/gajim.spec
index b4dfbfd799e1c52f92e687f6fbfe88689fcc761c..7926df0c68eb4ec3c18efdee46306c938739a75d 100644 (file)
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,50 +1,31 @@
 Summary:       A Jabber client written in PyGTK
 Summary(pl.UTF-8):     Klient Jabbera napisany w PyGTK
 Name:          gajim
 Summary:       A Jabber client written in PyGTK
 Summary(pl.UTF-8):     Klient Jabbera napisany w PyGTK
 Name:          gajim

-Version:       0.16.7
-Release:       2
+Version:       1.0.3
+Release:       1

 Epoch:         1
 License:       GPL v3+
 Group:         Applications/Communications
 Epoch:         1
 License:       GPL v3+
 Group:         Applications/Communications

-Source0:       http://gajim.org/downloads/0.16/%{name}-%{version}.tar.bz2
-# Source0-md5: 08d6fc3025977700e5bafde12cda36f4
+Source0:       http://gajim.org/downloads/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 08091dafd70c092711dca73991e8aee4

 URL:           http://www.gajim.org/
 URL:           http://www.gajim.org/

-BuildRequires: autoconf
-BuildRequires: automake

 BuildRequires: gettext-tools
 BuildRequires: gettext-tools

-BuildRequires: gtkspell-devel
-BuildRequires: intltool
-BuildRequires: libtool
-BuildRequires: pkgconfig
-BuildRequires: python-pygtk-devel >= 2.8.0
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.177
-BuildRequires: xorg-lib-libSM-devel
-BuildRequires: xorg-lib-libXScrnSaver-devel
+BuildRequires: python3 >= 3.5
+BuildRequires: python3-setuptools >= 3.5

 Requires:      hicolor-icon-theme
 Requires:      hicolor-icon-theme

-Requires:      python-modules-sqlite
-%pyrequires_eq python-modules
-%pyrequires_eq python
-BuildConflicts:        gnustep-gui-devel
-Requires:      python-dns
-Requires:      python-docutils >= 0.4-2
-Requires:      python-nbxmpp
-Requires:      python-pygtk-glade >= 2.8.0
+Requires:      python3-nbxmpp
+Requires:      python3-pygobject3

 Suggests:      dbus(org.freedesktop.Notifications)
 Suggests:      gnome-keyring
 Suggests:      gnupg2
 Suggests:      dbus(org.freedesktop.Notifications)
 Suggests:      gnome-keyring
 Suggests:      gnupg2

-Suggests:      gpgme >= 1.0.0
-Suggests:      python-Crypto
-Suggests:      python-avahi
-Suggests:      python-dbus >= 0.82.1
-Suggests:      python-gnome-desktop-keyring
-Suggests:      python-gnome-gconf
-Suggests:      python-gnome-ui
-Suggests:      python-pyOpenSSL >= 0.9
-Suggests:      python-pyasn1
-Suggests:      python-modules-sqlite
+Suggests:      python3-Crypto
+Suggests:      python3-avahi
+Suggests:      python3-dbus >= 0.82.1
+Suggests:      python3-pyOpenSSL >= 0.9
+Suggests:      python3-pyasn1

 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7

+BuildArch:     noarch

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -63,33 +44,17 @@ działa z nim ładnie.
 %setup -q
 
 %build
 %setup -q
 
 %build

-%{__intltoolize}
-%{__aclocal} -I m4
-%{__libtoolize}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-%configure
-
-%{__make} \
-       CC="%{__cc}" \
-       PREFIX=%{_prefix} \
-       LIBDIR=/%{_lib}
+%py3_build %{?with_tests:test}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__make} install \
-       PREFIX=%{_prefix} \
-       LIBDIR=/%{_lib} \
-       DESTDIR=$RPM_BUILD_ROOT
-
-cp -a plugins/plugin_installer/*.pem $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/plugin_installer/
+%py3_install

 
 

-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/nb_NO
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/nb_NO

 
 

-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-       mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+[ -d $RPM_BUILD_ROOT%{_localedir}/sr@latin ] || \
+       mv -f $RPM_BUILD_ROOT%{_localedir}/sr@{Latn,latin}

 %find_lang %{name}
 
 %clean
 %find_lang %{name}
 
 %clean


@@ -103,12 +68,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc AUTHORS ChangeLog README THANKS THANKS.artists

 %attr(755,root,root) %{_bindir}/gajim*
 %attr(755,root,root) %{_bindir}/gajim*

-%{_datadir}/%{name}
-%{_desktopdir}/gajim.desktop
-%{_desktopdir}/gajim-remote.desktop
+%{_desktopdir}/org.gajim.Gajim.desktop

 %{_mandir}/man1/*.1*
 %{_mandir}/man1/*.1*

-%{_iconsdir}/hicolor/64x64/apps/gajim.png
-%{_iconsdir}/hicolor/128x128/apps/gajim.png
-%{_iconsdir}/hicolor/scalable/apps/gajim.svg
+%{_iconsdir}/hicolor/*/apps/org.gajim.Gajim.png
+%{_iconsdir}/hicolor/scalable/apps/org.gajim.Gajim.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg
+%{_datadir}/metainfo/org.gajim.Gajim.appdata.xml
+%{py3_sitescriptdir}/gajim
+%{py3_sitescriptdir}/gajim-%{version}-py*.egg-info