Merge pull request #319 from BOPOHA/master

Skypeweb : Fix for RPM package building from @BOPOHA 

2 files changed, 24 insertions, 12 deletions

diff --git a/skypeweb/README.md b/skypeweb/README.md
index c719aba..a2d965a 100644
--- a/skypeweb/README.md
+++ b/skypeweb/README.md
@@ -26,10 +26,13 @@ Building RPM package for Fedora/openSUSE/CentOS/RHEL
 ---------
 Requires devel headers/libs for libpurple and json-glib, gcc compiler and rpmbuild tool
 ```
-	sudo yum install git rpm-build gcc json-glib-devel libpurple-devel pidgin-devel
-	cd skype4pidgin/skypeweb
-	tar -czf skypeweb.tar.gz *
-	rpmbuild -tb skypeweb.tar.gz
+	sudo yum install rpm-build gcc json-glib-devel libpurple-devel zlib-devel make automake glib2-devel -y
+	mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
+	wget https://raw.githubusercontent.com/EionRobb/skype4pidgin/master/skypeweb/purple-skypeweb.spec \
+		-O ~/rpmbuild/SPECS/purple-skypeweb.spec
+	wget https://github.com/EionRobb/skype4pidgin/archive/master.tar.gz \
+		-O ~/rpmbuild/SOURCES/skype4pidgin-0.1.tar.gz
+	rpmbuild -ba  ~/rpmbuild/SPECS/purple-skypeweb.spec
 ```
 The result can be found in ``~/rpmbuild/RPMS/`uname -m`/`` directory.
 
diff --git a/skypeweb/purple-skypeweb.spec b/skypeweb/purple-skypeweb.spec
index 6bebbe5..5ce55cf 100644
--- a/skypeweb/purple-skypeweb.spec
+++ b/skypeweb/purple-skypeweb.spec
@@ -1,15 +1,22 @@
 %define debug_package %{nil}
 %define plugin_name skypeweb
+%define project_name skype4pidgin
+%define purplelib_name purple-%{plugin_name}
 
-Name: purple-%{plugin_name}
+Name: %{project_name}
 Version: 0.1
 Release: 1
-Summary: Adds support for Skype to Pidgin
+Summary: Skype plugin for Pidgin/Adium/libpurple
 Group: Applications/Productivity
 License: GPLv3
 URL: https://github.com/EionRobb/skype4pidgin
-Source0: %{plugin_name}.tar.gz
+Source0: %{project_name}-%{version}.tar.gz
+
+%description
+meta pkj.
 
+%package -n %{purplelib_name}
+Summary: Adds support for Skype to Pidgin
 BuildRequires: glib2-devel
 BuildRequires: libpurple-devel
 BuildRequires: json-glib-devel
@@ -22,24 +29,26 @@ Summary: Adds pixmaps, icons and smileys for Skype protocol.
 Requires: %{name}
 Requires: pidgin
 
-%description
+%description -n %{purplelib_name}
 Adds support for Skype to Pidgin, Adium, Finch and other libpurple 
 based messengers.
 
 %description -n pidgin-%{plugin_name}
 Adds pixmaps, icons and smileys for Skype protocol inplemented by libskypeweb.
 
-%prep
+%prep -n %{purplelib_name}
 %setup -c
 
-%build
+%build -n %{purplelib_name}
+cd %{project_name}-*/%{plugin_name}
 make
 
 %install
+cd %{project_name}-*/%{plugin_name}
 make install DESTDIR=%{buildroot}
 
-%files
-%{_libdir}/purple-2/libskypeweb.so
+%files -n %{purplelib_name}
+%{_libdir}/purple-2/lib%{plugin_name}.so
 
 %files -n pidgin-%{plugin_name}
 %{_datadir}/pixmaps/pidgin/protocols/16/skype.png