Accepting request 257736 from home:scarabeus_iv:branches:KDE:Extra
Update to actually build with suse rpmlintrc, now it should be passing. OBS-URL: https://build.opensuse.org/request/show/257736 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=18
This commit is contained in:
Raymond Wooninck
Git OBS Bridge
parent
7c14f39b14
commit
4c3b8c9160
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23
|
||||
size 2873233
|
||||
3
quassel-0.11.0.tar.bz2
Normal file
3
quassel-0.11.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504
|
||||
size 2875387
|
||||
@ -1,7 +1,6 @@
|
||||
addFilter("incoherent-init-script-name quasselcore")
|
||||
addFilter("incoherent-logrotate-file /etc/logrotate.d/quasselcore")
|
||||
addFilter("non-conffile-in-etc /etc/sysconfig/SuSEfirewall2.d/services/quassel")
|
||||
addFilter("useless-explicit-requires kdebase4-runtime")
|
||||
addFilter("explicit-lib-dependency libqt4_sql_backend")
|
||||
addFilter("explicit-lib-dependency libqt5_sql_backend")
|
||||
addFilter("non-standard-uid /var/log/quassel quasslecore")
|
||||
addFilter("non-standard-uid /var/lib/quasselcore quasslecore")
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 19 12:31:40 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Base us on Qt5 build - currently no direct KF5 integration
|
||||
- Version bump to 0.11:
|
||||
* New build requirements:
|
||||
- C++11 capable compiler (gcc 4.7+, clang 3.3+, MSVC 2013+)
|
||||
- cmake 2.8.9+
|
||||
* Full support for Qt 5.2+ in addition to Qt 4.6+
|
||||
* Completely revamp the build system, making use of "new" CMake features
|
||||
* Fix buffer hotlist sorting
|
||||
* Split CTCP messages if they're too long
|
||||
* Make database problems more obvious
|
||||
* Fix backlog loading for QuasselDroid
|
||||
* Properly save the toolbar state on Mac OSX
|
||||
* Fix a crash with KDE's network detection
|
||||
* Various other fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 31 14:16:32 UTC 2014 - dimstar@opensuse.org
|
||||
|
||||
|
||||
99
quassel.spec
99
quassel.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: quassel
|
||||
Version: 0.10.0
|
||||
Version: 0.11.0
|
||||
Release: 0
|
||||
Summary: Modern, cross-platform, distributed IRC client
|
||||
License: GPL-2.0 or GPL-3.0
|
||||
@ -29,14 +29,30 @@ Source2: sysconfig.%{name}core
|
||||
Source3: logrotate.%{name}core
|
||||
Source4: %{name}.SuSEfirewall2
|
||||
Source5: quassel-rpmlintrc
|
||||
# Package/enable https://github.com/TheOneRing/Snorenotify
|
||||
BuildRequires: cmake >= 2.8.10
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libQtWebKit-devel
|
||||
BuildRequires: libdbusmenu-qt-devel
|
||||
BuildRequires: libkde4-devel
|
||||
BuildRequires: libqca2-devel
|
||||
BuildRequires: git
|
||||
BuildRequires: phonon4qt5-devel
|
||||
BuildRequires: systemd
|
||||
%{?systemd_requires}
|
||||
BuildRequires: pkgconfig(Qt5CLucene)
|
||||
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
|
||||
BuildRequires: pkgconfig(Qt5Designer)
|
||||
BuildRequires: pkgconfig(Qt5DesignerComponents)
|
||||
BuildRequires: pkgconfig(Qt5Gui)
|
||||
BuildRequires: pkgconfig(Qt5Help)
|
||||
BuildRequires: pkgconfig(Qt5Network)
|
||||
BuildRequires: pkgconfig(Qt5Script)
|
||||
BuildRequires: pkgconfig(Qt5ScriptTools)
|
||||
BuildRequires: pkgconfig(Qt5Sql)
|
||||
BuildRequires: pkgconfig(Qt5UiTools)
|
||||
BuildRequires: pkgconfig(Qt5WebKit)
|
||||
BuildRequires: pkgconfig(Qt5WebKitWidgets)
|
||||
BuildRequires: pkgconfig(Qt5Widgets)
|
||||
BuildRequires: pkgconfig(dbusmenu-qt5)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{?systemd_requires}
|
||||
|
||||
%description
|
||||
Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that
|
||||
@ -52,14 +68,11 @@ available.
|
||||
Summary: Modern, cross-platform, distributed IRC client
|
||||
Group: Productivity/Networking/IRC
|
||||
Requires: %{name}-base = %{version}
|
||||
Requires: libqt4_sql_backend
|
||||
Recommends: libqt4-sql-sqlite
|
||||
Requires: libqt5_sql_backend
|
||||
Recommends: libQt5Sql5-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
|
||||
Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that
|
||||
@ -78,9 +91,6 @@ Summary: Modern, cross-platform, distributed IRC client
|
||||
Group: Productivity/Networking/IRC
|
||||
Requires: %{name}-base = %{version}
|
||||
Provides: %{name}_ui = %{version}
|
||||
Provides: kde4-%{name}-client = %{version}
|
||||
Obsoletes: kde4-%{name}-client < %{version}
|
||||
%kde4_runtime_requires
|
||||
|
||||
%description client
|
||||
Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that
|
||||
@ -97,13 +107,11 @@ This is the quassel client only
|
||||
%package core
|
||||
Summary: Modern, cross-platform, distributed IRC client
|
||||
Group: Productivity/Networking/IRC
|
||||
PreReq: pwdutils
|
||||
PreReq: %fillup_prereq
|
||||
Requires: libqt4_sql_backend
|
||||
Requires: libqt5_sql_backend
|
||||
Requires: logrotate
|
||||
Recommends: libqt4-sql-sqlite
|
||||
Provides: kde4-%{name}-core = %{version}
|
||||
Obsoletes: kde4-%{name}-core < %{version}
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): pwdutils
|
||||
Recommends: libqt5-sql-sqlite
|
||||
|
||||
%description core
|
||||
Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that
|
||||
@ -121,8 +129,6 @@ This is the core only
|
||||
Summary: Modern, cross-platform, distributed IRC client
|
||||
Group: Productivity/Networking/IRC
|
||||
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
|
||||
@ -134,38 +140,39 @@ 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-%{name} ind kde4-%{name}-client
|
||||
This contains common parts shared by %{name} and %{name}-client
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/main.cpp
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/main.cpp src/common/quassel.cpp
|
||||
FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
|
||||
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/main.cpp
|
||||
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/main.cpp src/common/quassel.cpp
|
||||
|
||||
%cmake_kde4 -- -DWITH_KDE=ON -DWITH_OPENSSL=ON -DWITH_DBUS=ON -DWITH_PHONON=ON -DWITH_WEBKIT=ON
|
||||
%make_jobs
|
||||
%cmake \
|
||||
-DUSE_QT5=ON \
|
||||
-DWITH_WEBKIT=ON
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%kde_post_install
|
||||
%cmake_install
|
||||
%fdupes %{buildroot}
|
||||
install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}core
|
||||
install -d -m 755 %{buildroot}%{_kde4_sbindir}
|
||||
install -d -m 755 %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/quasselcore.service
|
||||
# Provide SUSE policy symlink /usr/sbin/rcFOO -> /etc/init.d/FOO
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcquasselcore
|
||||
install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.quasselcore
|
||||
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}
|
||||
install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}core
|
||||
install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
|
||||
|
||||
%pre core
|
||||
%{_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 \
|
||||
%{_bindir}/getent group %{name}core >/dev/null || %{_sbindir}/groupadd -r %{name}core || :
|
||||
%{_bindir}/getent passwd %{name}core >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{name}core \
|
||||
-s /bin/false -c "%{name}core daemon" -g %{name}core %{name}core || :
|
||||
%service_add_pre quasselcore.service
|
||||
|
||||
@ -182,23 +189,23 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_kde4_sysconfdir}/sysconfig/SuSEfirew
|
||||
%files mono
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS ChangeLog README
|
||||
%{_kde4_applicationsdir}/%{name}.desktop
|
||||
%{_kde4_bindir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_bindir}/%{name}
|
||||
|
||||
%files client
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS ChangeLog README
|
||||
%{_kde4_applicationsdir}/%{name}client.desktop
|
||||
%{_kde4_bindir}/%{name}client
|
||||
%{_datadir}/applications/%{name}client.desktop
|
||||
%{_bindir}/%{name}client
|
||||
|
||||
%files core
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS ChangeLog README
|
||||
%{_kde4_bindir}/%{name}core
|
||||
%{_kde4_sbindir}/rc%{name}core
|
||||
%{_bindir}/%{name}core
|
||||
%{_sbindir}/rc%{name}core
|
||||
%{_unitdir}/%{name}core.service
|
||||
%config(noreplace) %{_kde4_sysconfdir}/logrotate.d/%{name}core
|
||||
%config %{_kde4_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}core
|
||||
%config %{_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
|
||||
@ -206,8 +213,10 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_kde4_sysconfdir}/sysconfig/SuSEfirew
|
||||
%files base
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
%{_kde4_appsdir}/%{name}
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/%{name}.png
|
||||
%{_kde4_iconsdir}/hicolor/*/status/%{name}-*.png
|
||||
%dir %{_datadir}/apps
|
||||
%dir %{_datadir}/apps/%{name}
|
||||
%{_datadir}/apps/%{name}
|
||||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/*/status/%{name}-*.png
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user