From 4e7d31218595e7d21a9f38947f2c4f9772a95ee8af34b951a9fb95755391b3e5 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 12 Oct 2011 14:15:02 +0000 Subject: [PATCH] Accepting request 87437 from KDE:Distro:Factory - Added dbusmenu-qt buildrequires - Removed redundant or incorrect provides (fix for RPMLINT warning) - Cleaned up spec file formatting (forwarded request 87169 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/87437 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quassel?expand=0&rev=4 --- quassel.changes | 7 +++ quassel.spec | 137 ++++++++++++++++++++++-------------------------- 2 files changed, 69 insertions(+), 75 deletions(-) diff --git a/quassel.changes b/quassel.changes index d577dca..14c6c8c 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 9 12:29:54 UTC 2011 - toddrme2178@gmail.com + +- Added dbusmenu-qt buildrequires +- Removed redundant or incorrect provides (fix for RPMLINT warning) +- Cleaned up spec file formatting + ------------------------------------------------------------------- Thu Sep 29 11:00:32 UTC 2011 - herbert@graeber-clan.de diff --git a/quassel.spec b/quassel.spec index 881d257..acfb9c0 100644 --- a/quassel.spec +++ b/quassel.spec @@ -15,27 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: quassel Version: 0.7.3 Release: 1 License: GNU GPL v2 or v3 Summary: Modern, cross-platform, distributed IRC client +Url: http://%{name}-irc.org/ Group: Productivity/Networking/IRC -Url: http://quassel-irc.org/ -Source: http://quassel-irc.org/pub/%{name}-%{version}.tar.bz2 -Source1: init.quasselcore -Source2: sysconfig.quasselcore -Source3: logrotate.quasselcore -Source4: quassel.SuSEfirewall2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake +Source: http://%{name}-irc.org/pub/%{name}-%{version}.tar.bz2 +Source1: init.%{name}core +Source2: sysconfig.%{name}core +Source3: logrotate.%{name}core +Source4: %{name}.SuSEfirewall2 BuildRequires: fdupes +BuildRequires: libQtWebKit-devel +BuildRequires: libdbusmenu-qt-devel BuildRequires: libkde4-devel BuildRequires: libqca2-devel -BuildRequires: libQtWebKit-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRecommends:libdbusmenu-qt-devel %description @@ -49,18 +46,16 @@ making communication with your peers not only convenient, but also ubiquitous available. %package mono - Summary: Modern, cross-platform, distributed IRC client Group: Productivity/Networking/IRC -Requires: quassel-base = %{version}-%{release} -Provides: quassel = %{version} -Obsoletes: quassel < %{version} -Provides: kde4-quassel-mono = %{version} -Obsoletes: kde4-quassel-mono < %{version} -Provides: quassel_ui = %{version} -Provides: quassel:%{_bindir}/quasselclient Requires: libqt4_sql_backend +Requires: %{name}-base = %{version} Recommends: libqt4-sql-sqlite +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} +Provides: kde4-%{name}-mono = %{version} +Obsoletes: kde4-%{name}-mono < %{version} +Provides: %{name}_ui = %{version} %kde4_runtime_requires %description mono @@ -75,16 +70,14 @@ available. This is the quassel standalone client - %package client Summary: Modern, cross-platform, distributed IRC client Group: Productivity/Networking/IRC -Requires: quassel-base = %{version}-%{release} -Provides: quassel_ui = %{version} -Provides: quassel:%{_bindir}/quasselclient -Provides: kde4-quassel-client = %{version} -Obsoletes: kde4-quassel-client < %{version} +Requires: %{name}-base = %{version} +Provides: %{name}_ui = %{version} +Provides: kde4-%{name}-client = %{version} +Obsoletes: kde4-%{name}-client < %{version} %kde4_runtime_requires %description client @@ -99,21 +92,18 @@ available. This is the quassel client only - %package core - Summary: Modern, cross-platform, distributed IRC client Group: Productivity/Networking/IRC -Requires: %fillup_prereq -Requires: libqt4_sql_backend -Recommends: libqt4-sql-sqlite -Requires: logrotate -Provides: quassel:%{_bindir}/quasselcore -Provides: kde4-quassel-core = %{version} -Obsoletes: kde4-quassel-core < %{version} -PreReq: pwdutils PreReq: %fillup_prereq PreReq: %insserv_prereq +PreReq: pwdutils +Requires: %fillup_prereq +Requires: libqt4_sql_backend +Requires: logrotate +Recommends: libqt4-sql-sqlite +Provides: kde4-%{name}-core = %{version} +Obsoletes: kde4-%{name}-core < %{version} %description core Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that @@ -127,14 +117,12 @@ available. This is the core only - %package base - Summary: Modern, cross-platform, distributed IRC client Group: Productivity/Networking/IRC -Provides: kde4-quassel-base = %{version} -Obsoletes: kde4-quassel-base < %{version} -Requires: quassel_ui = %{version} +Requires: %{name}_ui = %{version} +Provides: kde4-%{name}-base = %{version} +Obsoletes: kde4-%{name}-base < %{version} %description base Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that @@ -146,8 +134,7 @@ Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), making communication with your peers not only convenient, but also ubiquitous available. -This contains common parts shared by kde4-quassel ind kde4-quassel-client - +This contains common parts shared by kde4-%{name} ind kde4-%{name}-client %prep %setup -q @@ -159,65 +146,65 @@ FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/main.cpp %cmake_kde4 -- -DWITH_KDE=ON -DWITH_OPENSSL=ON -DWITH_DBUS=ON -DWITH_PHONON=ON -DWITH_WEBKIT=ON -%make_jobs +%make_jobs %install -%makeinstall +%make_install %kde_post_install %fdupes %{buildroot} -install -d -m 755 %{buildroot}%{_var}/lib/quasselcore -install -d -m 755 %{buildroot}%{_sbindir} -install -D -m 755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/quasselcore -ln -sf ../../%{_sysconfdir}/init.d/quasselcore %{buildroot}%{_sbindir}/rcquasselcore -install -D -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.quasselcore -install -d -m 751 %{buildroot}/var/log/quassel -install -D -m 644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/quasselcore -install -D -m 644 %{S:4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/quassel +install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}core +install -d -m 755 %{buildroot}%{_kde4_sbindir} +install -D -m 755 %{SOURCE1} %{buildroot}%{_kde4_sysconfdir}/init.d/%{name}core +ln -sf ../../%{_kde4_sysconfdir}/init.d/%{name}core %{buildroot}%{_kde4_sbindir}/rc%{name}core +install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}core +install -d -m 751 %{buildroot}%{_localstatedir}/log/%{name} +install -D -m 644 %{SOURCE3} %{buildroot}%{_kde4_sysconfdir}/logrotate.d/%{name}core +install -D -m 644 %{SOURCE4} %{buildroot}%{_kde4_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %pre core -/usr/bin/getent group quasselcore >/dev/null || /usr/sbin/groupadd -r quasselcore || : -/usr/bin/getent passwd quasselcore >/dev/null || /usr/sbin/useradd -r -d /var/lib/quasselcore \ - -s /bin/false -c "quasselcore daemon" -g quasselcore quasselcore || : +%{_kde4_bindir}/getent group %{name}core >/dev/null || %{_kde4_sbindir}/groupadd -r %{name}core || : +%{_kde4_bindir}/getent passwd %{name}core >/dev/null || %{_kde4_sbindir}/useradd -r -d /var/lib/%{name}core \ + -s /bin/false -c "%{name}core daemon" -g %{name}core %{name}core || : %post core -%{fillup_and_insserv -yn quasselcore quasselcore} +%{fillup_and_insserv -yn %{name}core %{name}core} %preun core -%{stop_on_removal quasselcore} +%{stop_on_removal %{name}core} %postun core -%{restart_on_update quasselcore} +%{restart_on_update %{name}core} %{insserv_cleanup} %files mono %defattr(-,root,root) %doc AUTHORS ChangeLog README -%{_bindir}/quassel -%{_datadir}/applications/kde4/quassel.desktop +%{_kde4_applicationsdir}/%{name}.desktop +%{_kde4_bindir}/%{name} %files client %defattr(-,root,root) %doc AUTHORS ChangeLog README -%{_bindir}/quasselclient -%{_datadir}/applications/kde4/quasselclient.desktop +%{_kde4_applicationsdir}/%{name}client.desktop +%{_kde4_bindir}/%{name}client %files core %defattr(-,root,root) %doc AUTHORS ChangeLog README -%{_bindir}/quasselcore -%{_sysconfdir}/init.d/quasselcore -%{_sbindir}/rcquasselcore -%attr(-,quasselcore,quasselcore) %dir %{_var}/lib/quasselcore -%{_var}/adm/fillup-templates/sysconfig.quasselcore -%attr(-,quasselcore,quasselcore) %dir %{_var}/log/quassel -%config(noreplace) %{_sysconfdir}/logrotate.d/quasselcore -%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/quassel +%{_kde4_bindir}/%{name}core +%{_kde4_sbindir}/rc%{name}core +%config %{_kde4_sysconfdir}/init.d/%{name}core +%config(noreplace) %{_kde4_sysconfdir}/logrotate.d/%{name}core +%config %{_kde4_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%attr(-,%{name}core,%{name}core) %dir %{_localstatedir}/lib/%{name}core +%attr(-,%{name}core,%{name}core) %dir %{_localstatedir}/log/%{name} +%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}core %files base %defattr(-,root,root) -%{_datadir}/icons/hicolor/*/apps/quassel.png -%{_datadir}/icons/hicolor/*/status/quassel_*.png -%{_kde_share_dir}/apps/quassel -%{_datadir}/pixmaps/quassel.png +%{_datadir}/pixmaps/%{name}.png +%{_kde4_appsdir}/%{name} +%{_kde4_iconsdir}/hicolor/*/apps/%{name}.png +%{_kde4_iconsdir}/hicolor/*/status/%{name}_*.png %changelog