Removed the *64 spec files. Now the same spec file works for both architectures.

This commit is contained in:
codestation
2014-01-22 17:15:18 -04:30
parent 7234356319
commit 7b3d3e8249
4 changed files with 76 additions and 167 deletions

View File

@@ -2,20 +2,18 @@
# VitaMTP spec file # VitaMTP spec file
# #
Name: libvitamtp2 Name: libvitamtp
Version: 2.5.0
Release: 0
%define sonum 3
Summary: Low-level Vita communication library Summary: Low-level Vita communication library
License: GPL-3.0 License: GPL-3.0
Release: 2 Group: System/Libraries
Version: 2.1.0
URL: https://github.com/codestation/VitaMTP URL: https://github.com/codestation/VitaMTP
Source: https://github.com/codestation/VitaMTP.git Source: https://github.com/codestation/VitaMTP.git
Prefix: /usr BuildRequires: pkg-config
Group: System/Libraries BuildRequires: libxml2-devel
BuildRequires: libusb-1_0-devel
%package devel
Summary: Low-level Vita communication library - development files
Group: Development/Libraries/C and C++
Requires: libvitamtp2 == 2.1.0
%description %description
libVitaMTP is a library based off of libMTP that does low level USB libVitaMTP is a library based off of libMTP that does low level USB
@@ -23,6 +21,23 @@ communications with the Vita. It can read and receive MTP commands that
the Vita sends, which are a proprietary set of commands that is based on the Vita sends, which are a proprietary set of commands that is based on
the MTP open standard. the MTP open standard.
%package -n %{name}%{sonum}
Summary: Low-level Vita communication library
Group: System/Libraries
%description -n %{name}%{sonum}
libVitaMTP is a library based off of libMTP that does low level USB
communications with the Vita. It can read and receive MTP commands that
the Vita sends, which are a proprietary set of commands that is based on
the MTP open standard.
%package devel
Summary: Low-level Vita communication library - development files
Group: Development/Libraries/C and C++
Requires: %{name}%{sonum} = %{version}
Requires: libxml2-devel
Requires: libusb-1_0-devel
%description devel %description devel
libVitaMTP is a library based off of libMTP that does low level USB libVitaMTP is a library based off of libMTP that does low level USB
communications with the Vita. It can read and receive MTP commands that communications with the Vita. It can read and receive MTP commands that
@@ -30,39 +45,38 @@ the Vita sends, which are a proprietary set of commands that is based on
the MTP open standard. the MTP open standard.
This package contains only the files necessary for development. This package contains only the files necessary for development.
%changelog
* Tue Nov 05 2013 codestation <codestation> - 2.1.0
- Added new CMA version.
%prep %prep
rm -rf $RPM_SOURCE_DIR/libvitamtp2 rm -rf $RPM_SOURCE_DIR/%{name}%{sonum}
git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/libvitamtp2 git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/%{name}%{sonum}
cp -r $RPM_SOURCE_DIR/libvitamtp2 $RPM_BUILD_DIR/libvitamtp2 cp -r $RPM_SOURCE_DIR/%{name}%{sonum} $RPM_BUILD_DIR/%{name}%{sonum}
%setup -n libvitamtp2 -DT
%setup -n %{name}%{sonum} -DT
%build %build
./autogen.sh ./autogen.sh
./configure --prefix=/usr --disable-opencma ./configure --prefix=/usr --libdir=%{_libdir}
make make %{?_smp_mflags}
%install %install
make DESTDIR=%{buildroot} install %makeinstall
mkdir -p %{buildroot}/lib/udev/rules.d rm -rf %{buildroot}/%{_libdir}/*.la
cp debian/vitamtp1.udev %{buildroot}/lib/udev/rules.d/80-psvita.rules mkdir -p %{buildroot}/usr/lib/udev/rules.d
cp debian/vitamtp1.udev %{buildroot}/usr/lib/udev/rules.d/80-psvita.rules
%post -p /sbin/ldconfig %post -n %{name}%{sonum} -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -n %{name}%{sonum} -p /sbin/ldconfig
%files %files -n %{name}%{sonum}
%defattr(-,root,root,-) %defattr(-,root,root)
/lib/udev/rules.d/80-psvita.rules %doc README.md ChangeLog COPYING
/usr/lib/libvitamtp.la %{_libdir}/lib*.so.*
/usr/lib/libvitamtp.so.2 %{_udevrulesdir}/80-psvita.rules
/usr/lib/libvitamtp.so.2.0.0
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root)
/usr/include/vitamtp.h %{_prefix}/include/vitamtp.h
/usr/lib/libvitamtp.a %{_libdir}/libvitamtp.a
/usr/lib/libvitamtp.so %{_libdir}/libvitamtp.so
/usr/lib/pkgconfig/libvitamtp.pc %{_libdir}/pkgconfig/libvitamtp.pc
%changelog

View File

@@ -1,68 +0,0 @@
#
# VitaMTP spec file
#
Name: libvitamtp2
Summary: Low-level Vita communication library
License: GPL-3.0
Release: 2
Version: 2.1.0
URL: https://github.com/codestation/VitaMTP
Source: https://github.com/codestation/VitaMTP.git
Prefix: /usr
Group: System/Libraries
%package devel
Summary: Low-level Vita communication library - development files
Group: Development/Libraries/C and C++
Requires: libvitamtp2 == 2.1.0
%description
libVitaMTP is a library based off of libMTP that does low level USB
communications with the Vita. It can read and receive MTP commands that
the Vita sends, which are a proprietary set of commands that is based on
the MTP open standard.
%description devel
libVitaMTP is a library based off of libMTP that does low level USB
communications with the Vita. It can read and receive MTP commands that
the Vita sends, which are a proprietary set of commands that is based on
the MTP open standard.
This package contains only the files necessary for development.
%changelog
* Tue Nov 05 2013 codestation <codestation> - 2.1.0
- Added new CMA version.
%prep
rm -rf $RPM_SOURCE_DIR/libvitamtp2
git clone https://github.com/codestation/VitaMTP.git $RPM_SOURCE_DIR/libvitamtp2
cp -r $RPM_SOURCE_DIR/libvitamtp2 $RPM_BUILD_DIR/libvitamtp2
%setup -n libvitamtp2 -DT
%build
./autogen.sh
./configure --prefix=/usr --disable-opencma
make
%install
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/lib/udev/rules.d
cp debian/vitamtp1.udev %{buildroot}/lib/udev/rules.d/80-psvita.rules
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
/lib/udev/rules.d/80-psvita.rules
/usr/lib64/libvitamtp.la
/usr/lib64/libvitamtp.so.2
/usr/lib64/libvitamtp.so.2.0.0
%files devel
%defattr(-,root,root,-)
/usr/include/vitamtp.h
/usr/lib64/libvitamtp.a
/usr/lib64/libvitamtp.so
/usr/lib64/pkgconfig/libvitamtp.pc

View File

@@ -6,37 +6,42 @@ Name: qcma
Summary: PSVita Content Manager Assistant Summary: PSVita Content Manager Assistant
License: GPL-3.0 License: GPL-3.0
Release: 1 Release: 1
Version: 0.2.4 Version: 0.2.9
URL: https://github.com/codestation/qcma URL: https://github.com/codestation/qcma
Source: https://github.com/codestation/qcma.git Source: https://github.com/codestation/qcma.git
Prefix: /usr
Group: Productivity/File utilities Group: Productivity/File utilities
Requires: ffmpeg
Requires: libqt5-qtbase
Requires: libvitamtp3 >= 2.5.0
BuildRequires: pkg-config
BuildRequires: ffmpeg-devel
BuildRequires: libvitamtp-devel
BuildRequires: libqt5-qtbase-devel
%description %description
QCMA is an cross-platform application to provide a Open Source implementation QCMA is an cross-platform application to provide a Open Source implementation
of the original Content Manager Assistant that comes with the PS Vita. QCMA of the original Content Manager Assistant that comes with the PS Vita. QCMA
is meant to be compatible with Linux, Windows and MAC OS X. is meant to be compatible with Linux, Windows and MAC OS X.
%changelog
* Tue Nov 06 2013 codestation <codestation> - 0.2.4
- QCMA in WiFi mode is compatible with FW 3.00.
%prep %prep
rm -rf $RPM_SOURCE_DIR/qcma rm -rf $RPM_SOURCE_DIR/%{name}-%{version}
git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/qcma git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/%{name}-%{version}
cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma cp -r $RPM_SOURCE_DIR/%{name}-%{version} $RPM_BUILD_DIR/%{name}-%{version}
%setup -n qcma -DT
%setup -n %{name}-%{version} -DT
%build %build
lrelease resources/translations/*.ts lrelease resources/translations/*.ts
qmake PREFIX=/usr qmake-qt5 PREFIX=/usr
make make %{?_smp_mflags}
%install %install
make INSTALL_ROOT=%{buildroot} install make install INSTALL_ROOT=%{buildroot}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root)
/usr/bin/qcma %{_bindir}/qcma
/usr/share/applications/qcma/qcma.desktop %{_prefix}/share/applications/qcma/qcma.desktop
/usr/share/icons/hicolor/64x64/apps/qcma.png %{_prefix}/share/icons/hicolor/64x64/apps/qcma.png
%changelog

View File

@@ -1,42 +0,0 @@
#
# qcma spec file
#
Name: qcma
Summary: PSVita Content Manager Assistant
License: GPL-3.0
Release: 1
Version: 0.2.4
URL: https://github.com/codestation/qcma
Source: https://github.com/codestation/qcma.git
Prefix: /usr
Group: Productivity/File utilities
%description
QCMA is an cross-platform application to provide a Open Source implementation
of the original Content Manager Assistant that comes with the PS Vita. QCMA
is meant to be compatible with Linux, Windows and MAC OS X.
%changelog
* Tue Nov 06 2013 codestation <codestation> - 0.2.4
- QCMA in WiFi mode is compatible with FW 3.00.
%prep
rm -rf $RPM_SOURCE_DIR/qcma
git clone https://github.com/codestation/qcma.git $RPM_SOURCE_DIR/qcma
cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma
%setup -n qcma -DT
%build
lrelease resources/translations/*.ts
qmake PREFIX=/usr
make
%install
make INSTALL_ROOT=%{buildroot} install
%files
%defattr(-,root,root,-)
/usr/bin/qcma
/usr/share/applications/qcma/qcma.desktop
/usr/share/icons/hicolor/64x64/apps/qcma.png