Request 3816 (accepted)

Overview

Request 3816 (accepted)

- switch to new, sane, versioning, following upstream versions
- Update to version 16.02.03+4:
* * fixed fingerprint.jisp
* * fix again fingerprint.jisp
* Added Emojis smileypack
* Emojis updated to the latest version
* Add minimal pack of client icons
* Fix file permissions
* Fixed Emojis smiles. Version up to 1.1
* Added chess.jisp affilication iconset (thanks to Леван)
* Added simple.jisp emoticons by Lyn
* Removed msn and yaonline icons from fingerprint.jisp
- icons from the main repo are now installed with psi+ natively,
so drop main from here completely

Created by jirislaby over 7 years ago
In state accepted
Package maintainer: jirislaby

Submit psi+-iconsets

Submit package home:jirisla...s:Essentials / psi+-iconsets to package Essentials / psi+-iconsets

psi+-iconsets.changes Changed

psi+-iconsets.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package psi+-iconsets
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,46 +16,36 @@
 #
 
 
-%define version_unconverted 20170108
+%define version_unconverted 16.02.03+4
 
 Name:           psi+-iconsets
-Url:            http://code.google.com/p/psi-dev/
-Version:        20170108
+Url:            https://github.com/psi-plus
+Version:        16.02.03+4
 Release:        0
 Summary:        Icons for Psi
 License:        GPL-2.0 and CC-BY-ND-3.0
 Group:          Productivity/Networking/Talk/Clients
-# only for psi+ with icons from upstream (otherwise some will be missing)
-Requires:       psi+ >= 20160408
-Source0:        psi-plus-main-%{version}.tar.xz
-Source1:        psi-plus-resources-1.tar.xz
+Requires:       psi+ >= 0.16.584
+Source0:        psi-plus-resources-%{version}.tar.xz
 BuildArch:      noarch
 BuildRequires:  fdupes
 BuildRequires:  xz
+Obsoletes:      %{name} >= 20100101
 
 %define iconspath %{_datadir}/psi-plus/iconsets
 
 %prep
-%setup -q -n psi-plus-main-%{version} -b 1
+%setup -q -n psi-plus-resources-%{version}
 
 %build
 
 %install
 install -d -m 0755 %{buildroot}/%{iconspath}
 
-for DIR in clients/default; do
-	DEST="%{buildroot}/%{iconspath}/$DIR/"
-	install -d -m 0755 "$DEST"
-	install -m 0644 -t "$DEST" iconsets/"$DIR"/icondef.xml
-	install -m 0644 -t "$DEST" iconsets/"$DIR"/*.png
-done
-
-install -m 0644 -t "%{buildroot}/%{iconspath}/clients/default/" 'iconsets/clients/default/FP_Freeware License.txt'
-
 for DIR in activities affiliations clients emoticons moods roster system; do
 	DEST="%{buildroot}/%{iconspath}/$DIR/"
 	install -d -m 0755 "$DEST"
-	install -m 0644 -t "$DEST" ../psi-plus-resources-1/iconsets/"$DIR"/*.jisp
+	install -m 0644 -t "$DEST" iconsets/"$DIR"/*.jisp
 done
 
 %fdupes $RPM_BUILD_ROOT/%{iconspath}
@@ -70,7 +60,6 @@
 %dir %{iconspath}/activities
 %dir %{iconspath}/affiliations
 %dir %{iconspath}/clients
-%dir %{iconspath}/clients/default
 %dir %{iconspath}/emoticons
 %dir %{iconspath}/moods
 %dir %{iconspath}/roster
@@ -82,8 +71,5 @@
 %{iconspath}/moods/*.jisp
 %{iconspath}/roster/*.jisp
 %{iconspath}/system/*.jisp
-%{iconspath}/clients/default/icondef.xml
-%{iconspath}/clients/default/FP_Freeware?License.txt
-%{iconspath}/clients/default/*.png
 
 %changelog

_service Changed

@@ -1,23 +1,17 @@
 <services>
-  <service mode="localonly" name="tar_scm">
-    <param name="url">git://github.com/psi-plus/main.git</param>
-    <param name="scm">git</param>
-    <param name="filename">psi-plus-main</param>
-    <param name="include">iconsets</param>
-    <param name="versionformat">%cd</param>
-  </service>
-  <service mode="localonly" name="tar_scm">
+  <service mode="disabled" name="tar_scm">
     <param name="url">git://github.com/psi-plus/resources.git</param>
     <param name="scm">git</param>
     <param name="filename">psi-plus-resources</param>
     <param name="include">iconsets</param>
-    <param name="version">1</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="changesgenerate">enable</param>
   </service>
-  <service mode="localonly" name="recompress">
+  <service mode="disabled" name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service mode="localonly" name="set_version">
-    <param name="basename">psi-plus-main</param>
-  </service>
+  <service mode="disabled" name="set_version"/>
 </services>

_servicedata Added

psi-plus-main-20170108.tar.xz Deleted

psi-plus-resources-1.tar.xz Deleted

psi-plus-resources-16.02.03+4.tar.xz Added

Build Results
RPM Lint

Refresh

Comments for request 3816 0

Request History

jirislaby created request over 7 years ago

olh accepted request over 7 years ago