Open Build Service

Changes of Revision 138

jsj-installtools.spec Changed

@@ -40,12 +40,11 @@
 Source33:     RunZypperUpdateCron.service
 Source34:     RunZypperUpdateCron.timer
 #Requires:     check_mk-agent-plugins
-%if %{with systemd}
-BuildRequires:  pkgconfig(systemd)
-%{?systemd_ordering}
-%endif
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
 BuildArch:    noarch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 
 %description
 A set of bash scripts to quickly set up installed virtual hosts at
@@ -56,8 +55,8 @@
 %install
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install -Dm755 %{S:1} $RPM_BUILD_ROOT/usr/bin
+#mkdir -p $RPM_BUILD_ROOT/usr/bin
+install -Dm755 %{S:1} $RPM_BUILD_ROOT/%{_bindir}/CreateConfig
 install -Dm755 %{S:2} $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
 install -Dm755 %{S:3} $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
 install -Dm755 %{S:4} $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
@@ -82,11 +81,11 @@
 install -Dm644 %{S:30} $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
 install -Dm644 %{S:31} $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
 install -Dm644 %{S:32} $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools
-install -Dm755 %{S:15} $RPM_BUILD_ROOT/usr/bin
-install -Dm755 %{S:16} $RPM_BUILD_ROOT/usr/bin
-install -Dm755 %{S:17} $RPM_BUILD_ROOT/usr/bin
-install -Dm644 %{S:33} $RPM_BUILD_ROOT/%{_unitdir}
-install -Dm644 %{S:34} $RPM_BUILD_ROOT/%{_unitdir}
+install -Dm755 %{S:15} $RPM_BUILD_ROOT/%{_bindir}/EnableProxy
+install -Dm755 %{S:16} $RPM_BUILD_ROOT/%{_bindir}/DisableProxy
+install -Dm755 %{S:17} $RPM_BUILD_ROOT/%{_bindir}/ShowCertificateChainFile
+install -Dm644 %{S:33} $RPM_BUILD_ROOT/%{_unitdir}/RunZypperUpdateCron.service
+install -Dm644 %{S:34} $RPM_BUILD_ROOT/%{_unitdir}/RunZypperUpdateCron.timer
 
 # 13.2 is 1320 and later Leap 42.1 is 1315
 %if 0%{?suse_version} >= 1315
@@ -96,9 +95,6 @@
   sed -i -e 's/zypper ar -t $(^)*)/zypper ar/' $RPM_BUILD_ROOT/%{_datadir}/jsjinstalltools/GetZypperSources
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pre
 %service_add_pre RunZypperUpdateCron.service RunZypperUpdateCron.timer
 
@@ -114,10 +110,13 @@
 %files
 %defattr (-,root,root,-)
 %if 0%{?suse_version} >= 1210
-%dir /usr/bin
 %endif
-/usr/bin/*
+%{_bindir}/CreateConfig
+%{_bindir}/EnableProxy
+%{_bindir}/DisableProxy
+%{_bindir}/ShowCertificateChainFile
 %dir %{_datadir}/jsjinstalltools
 %{_datadir}/jsjinstalltools/*
-%{_unitdir}
+%{_unitdir}/RunZypperUpdateCron.service
+%{_unitdir}/RunZypperUpdateCron.timer
 %changelog

GetVersion Changed