SHA256
1
0
forked from pool/quassel

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
This commit is contained in:
Lars Vogdt 2011-10-12 14:15:02 +00:00 committed by Git OBS Bridge
parent 03a0a00d2c
commit e29a1630cf
2 changed files with 69 additions and 75 deletions

View File

@ -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 Thu Sep 29 11:00:32 UTC 2011 - herbert@graeber-clan.de

View File

@ -15,27 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: quassel Name: quassel
Version: 0.7.3 Version: 0.7.3
Release: 1 Release: 1
License: GNU GPL v2 or v3 License: GNU GPL v2 or v3
Summary: Modern, cross-platform, distributed IRC client Summary: Modern, cross-platform, distributed IRC client
Url: http://%{name}-irc.org/
Group: Productivity/Networking/IRC Group: Productivity/Networking/IRC
Url: http://quassel-irc.org/ Source: http://%{name}-irc.org/pub/%{name}-%{version}.tar.bz2
Source: http://quassel-irc.org/pub/%{name}-%{version}.tar.bz2 Source1: init.%{name}core
Source1: init.quasselcore Source2: sysconfig.%{name}core
Source2: sysconfig.quasselcore Source3: logrotate.%{name}core
Source3: logrotate.quasselcore Source4: %{name}.SuSEfirewall2
Source4: quassel.SuSEfirewall2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: libQtWebKit-devel
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libkde4-devel BuildRequires: libkde4-devel
BuildRequires: libqca2-devel BuildRequires: libqca2-devel
BuildRequires: libQtWebKit-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRecommends:libdbusmenu-qt-devel BuildRecommends:libdbusmenu-qt-devel
%description %description
@ -49,18 +46,16 @@ making communication with your peers not only convenient, but also ubiquitous
available. available.
%package mono %package mono
Summary: Modern, cross-platform, distributed IRC client Summary: Modern, cross-platform, distributed IRC client
Group: Productivity/Networking/IRC 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: libqt4_sql_backend
Requires: %{name}-base = %{version}
Recommends: libqt4-sql-sqlite 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 %kde4_runtime_requires
%description mono %description mono
@ -75,16 +70,14 @@ available.
This is the quassel standalone client This is the quassel standalone client
%package client %package client
Summary: Modern, cross-platform, distributed IRC client Summary: Modern, cross-platform, distributed IRC client
Group: Productivity/Networking/IRC Group: Productivity/Networking/IRC
Requires: quassel-base = %{version}-%{release} Requires: %{name}-base = %{version}
Provides: quassel_ui = %{version} Provides: %{name}_ui = %{version}
Provides: quassel:%{_bindir}/quasselclient Provides: kde4-%{name}-client = %{version}
Provides: kde4-quassel-client = %{version} Obsoletes: kde4-%{name}-client < %{version}
Obsoletes: kde4-quassel-client < %{version}
%kde4_runtime_requires %kde4_runtime_requires
%description client %description client
@ -99,21 +92,18 @@ available.
This is the quassel client only This is the quassel client only
%package core %package core
Summary: Modern, cross-platform, distributed IRC client Summary: Modern, cross-platform, distributed IRC client
Group: Productivity/Networking/IRC 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: %fillup_prereq
PreReq: %insserv_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 %description core
Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that
@ -127,14 +117,12 @@ available.
This is the core only This is the core only
%package base %package base
Summary: Modern, cross-platform, distributed IRC client Summary: Modern, cross-platform, distributed IRC client
Group: Productivity/Networking/IRC Group: Productivity/Networking/IRC
Provides: kde4-quassel-base = %{version} Requires: %{name}_ui = %{version}
Obsoletes: kde4-quassel-base < %{version} Provides: kde4-%{name}-base = %{version}
Requires: quassel_ui = %{version} Obsoletes: kde4-%{name}-base < %{version}
%description base %description base
Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that 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 making communication with your peers not only convenient, but also ubiquitous
available. 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 %prep
%setup -q %setup -q
@ -162,62 +149,62 @@ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/main.cpp
%make_jobs %make_jobs
%install %install
%makeinstall %make_install
%kde_post_install %kde_post_install
%fdupes %{buildroot} %fdupes %{buildroot}
install -d -m 755 %{buildroot}%{_var}/lib/quasselcore install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}core
install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_kde4_sbindir}
install -D -m 755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/quasselcore install -D -m 755 %{SOURCE1} %{buildroot}%{_kde4_sysconfdir}/init.d/%{name}core
ln -sf ../../%{_sysconfdir}/init.d/quasselcore %{buildroot}%{_sbindir}/rcquasselcore ln -sf ../../%{_kde4_sysconfdir}/init.d/%{name}core %{buildroot}%{_kde4_sbindir}/rc%{name}core
install -D -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.quasselcore install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}core
install -d -m 751 %{buildroot}/var/log/quassel install -d -m 751 %{buildroot}%{_localstatedir}/log/%{name}
install -D -m 644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/quasselcore install -D -m 644 %{SOURCE3} %{buildroot}%{_kde4_sysconfdir}/logrotate.d/%{name}core
install -D -m 644 %{S:4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/quassel install -D -m 644 %{SOURCE4} %{buildroot}%{_kde4_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%pre core %pre core
/usr/bin/getent group quasselcore >/dev/null || /usr/sbin/groupadd -r quasselcore || : %{_kde4_bindir}/getent group %{name}core >/dev/null || %{_kde4_sbindir}/groupadd -r %{name}core || :
/usr/bin/getent passwd quasselcore >/dev/null || /usr/sbin/useradd -r -d /var/lib/quasselcore \ %{_kde4_bindir}/getent passwd %{name}core >/dev/null || %{_kde4_sbindir}/useradd -r -d /var/lib/%{name}core \
-s /bin/false -c "quasselcore daemon" -g quasselcore quasselcore || : -s /bin/false -c "%{name}core daemon" -g %{name}core %{name}core || :
%post core %post core
%{fillup_and_insserv -yn quasselcore quasselcore} %{fillup_and_insserv -yn %{name}core %{name}core}
%preun core %preun core
%{stop_on_removal quasselcore} %{stop_on_removal %{name}core}
%postun core %postun core
%{restart_on_update quasselcore} %{restart_on_update %{name}core}
%{insserv_cleanup} %{insserv_cleanup}
%files mono %files mono
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README
%{_bindir}/quassel %{_kde4_applicationsdir}/%{name}.desktop
%{_datadir}/applications/kde4/quassel.desktop %{_kde4_bindir}/%{name}
%files client %files client
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README
%{_bindir}/quasselclient %{_kde4_applicationsdir}/%{name}client.desktop
%{_datadir}/applications/kde4/quasselclient.desktop %{_kde4_bindir}/%{name}client
%files core %files core
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README
%{_bindir}/quasselcore %{_kde4_bindir}/%{name}core
%{_sysconfdir}/init.d/quasselcore %{_kde4_sbindir}/rc%{name}core
%{_sbindir}/rcquasselcore %config %{_kde4_sysconfdir}/init.d/%{name}core
%attr(-,quasselcore,quasselcore) %dir %{_var}/lib/quasselcore %config(noreplace) %{_kde4_sysconfdir}/logrotate.d/%{name}core
%{_var}/adm/fillup-templates/sysconfig.quasselcore %config %{_kde4_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%attr(-,quasselcore,quasselcore) %dir %{_var}/log/quassel %attr(-,%{name}core,%{name}core) %dir %{_localstatedir}/lib/%{name}core
%config(noreplace) %{_sysconfdir}/logrotate.d/quasselcore %attr(-,%{name}core,%{name}core) %dir %{_localstatedir}/log/%{name}
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/quassel %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}core
%files base %files base
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/icons/hicolor/*/apps/quassel.png %{_datadir}/pixmaps/%{name}.png
%{_datadir}/icons/hicolor/*/status/quassel_*.png %{_kde4_appsdir}/%{name}
%{_kde_share_dir}/apps/quassel %{_kde4_iconsdir}/hicolor/*/apps/%{name}.png
%{_datadir}/pixmaps/quassel.png %{_kde4_iconsdir}/hicolor/*/status/%{name}_*.png
%changelog %changelog